Merge "Add goldmanj to settings owners files."