Reverting changes to test since util.keys was fixed
@rev lhong@
@bug W-2343003@
Merging origin/mike/master-pending-revert_testBackToOriginal into master