Backed out changeset be5ab74ccc18 (bug 1066187) for breaking Marionette on older release branches.
Merge from default.

--HG--
branch : production