Bug 993546 - Fix uplift rebasing error. a=bustage