CAMEL-6428 Fixed camel-salesforce regressions with thanks to Dhiraj