Add conditional result for SFDC
@bug W-2061981@
@rev rjayaramappa@
Merging origin/bob/master-pending/client-library-test-fix into master