Test for #1058.
Minor clean-up changes.
Merge pull request #1068 from SalesforceFoundation/feature/1060-refactor-getcontactssettings

Feature/1060 refactor getcontactssettings
Merge dev into feature/run-parallel-tests