bug 1025322 - gaia-try expects 1 to 5 files, more than the average tests change r=jlund
Bug 1033161 - Run upload within mock, r=Callek
Merging from default

--HG--
branch : production