ios-driver test fixes

@bug W-2164325@
@rev gtorres@
Merging origin/tbliss/master-pending-ios-driver-test-fixes-2 into master