Bug 861277 - Uplift addon-sdk's integration branch