Bug 1047121: mis-merge bustage fix rs=bustage a=bustage