bug 821445 - mozharness production branch. r=rail

--HG--
extra : rebase_source : 2931286c100688effce2537c620cc97133c95f76