Merge pull request #7912 from mbauskar/develop

[minor] fixes contact field set query for opportunity