Test failure fixes
@bug W-2064883@
@bug W-2084495@
@rev tbliss@
@rev ssun@
Merging origin/ctatlah/master-pending-testFailureFix into master