Revert Bug 1022368 - Kill some puppet masters in AWS
Merging from default

changeset:   1835:da69a61b039e
tag:         tip
parent:      1833:42b776622e26
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Jun 16 11:30:06 2014 -0400
summary:     Revert Bug 1022368 - Kill some puppet masters in AWS

--HG--
branch : production