Bug 899574 - updating marionette tests to not rely on old origin format