Merge pull request #2624 from sebv/master

Fixing remaining ios71 tests
ios6 testapp and uicatalog test fixes