ios6 testapp and uicatalog test fixes
Merge pull request #2628 from sebv/master

ios6 testapp and uicatalog test fixes
ci android branch for build #4502.3