Bug 971780 - Add new test master defs to puppet, to instantiate. r=armenmzg

--HG--
extra : rebase_source : 5916473005a965a0c6518c45f78f5ee48db33c2d
Merge from default

--HG--
branch : production