Backed out changeset 764540e94692 (bug 871350) because it broke the Jetpack tests
Bug 871350 - Uplift Add-on SDK integration branch to Firefox