fixup! Bug 1073732 - Refactor Marionette and introduce session ID's. r=mdas