ios-driver test fixes round 2

@bug W-2164325@
@rev lhong@
Merging origin/tbliss/master-pending-ios-driver-test-fixes3 into master