Added Salesforce upsert method + new setting on Feed to select primary key