Bug 929062 - Use aurora on 1.2 and update marionette client to version which is compatible with gecko 26
Merge pull request #13148 from lightsofapollo/bug-929062

Bug 929062 - Use aurora on 1.2 and update marionette client to version w...
Bug 911934 - Honor the expiration date if present in a message r=julienw