Bug 1043023 - backout mock env change until golden AMI are regenerated
Merging from default

changeset:   10808:6446fc04c928
tag:         tip
parent:      10806:a0a864fa9f84
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Mon Aug 11 16:42:50 2014 -0400
summary:     Bug 1043023 - backout mock env change until golden AMI are regenerated

--HG--
branch : production