#1697. Avoid duplicating field mapping fields in RD query.
#1697. Avoid duplicating field mapping fields in RD query.

jlantz/Cumulus,jlantz/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,SalesforceFoundation/Cumulus,cdcarter/Cumulus,SalesforceFoundation/Cumulus,cdcarter/Cumulus,jlantz/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,cdcarter/Cumulus,Zosoled/Cumulus,cdcarter/Cumulus,Zosoled/Cumulus,jlantz/Cumulus