Fix ClientLibraryServiceImplTest tests for SFDC
Merging origin/bob/master-pending/clientlibraryservice-test-fix into master