removed custom transformer now that connector is patched
Merge remote-tracking branch 'origin/sf-sandbox' into sf-sandbox

Conflicts:
	salesforce/src/main/app/upsert-with-fk.xml