bug 984364: assert facts about puppetmasters and foopies, r=dustin
Merge default -> production

--HG--
branch : production