Bug 899420 - Kill more b2g bustage, real and potential on a CLOSED TREE r=bustage