Merge pull request #2628 from sebv/master

ios6 testapp and uicatalog test fixes
fixing ios tests