Label provider test fix for SFDC

@bug W-2234158@
@rev gtorres@
Merging origin/tbliss/master-pending-label-test-fix into master