Merge remote-tracking branch 'origin/master' into salesforceMetaData

Conflicts:
	doc/mule-module-sfdc.xml.sample
	src/main/java/org/mule/modules/salesforce/BaseSalesforceConnector.java