Merge salesforce_webform into salesforce_genmap
Readjust merge of *_entity and *_sync to match *_genmap and *_webform

Figured out a better way of doing it.