Bug 1107460 - [v2.2] Update marionette version to 0.8.5