Bug 1047442: bustage fix (unified builds) rs=bustage,kwierso on a CLOSED TREE