Bug 899574 - updating marionette tests to not rely on old origin format
Merge pull request #12836 from mikehenrty/bug-899574-integration-tests

Bug 899574 - updating marionette tests to not rely on old origin format, r=qDot