Bug 950488 - Bustage fixup for uplift to aurora. r=me a=1.3+