Back out 6a5dcf166f09 (bug 836072) for build bustage
CLOSED TREE
Bug 838745 - Prevent crashing if a promo type is dropped r=bnicholson
Bug 839242 - Remove unused onunload handler from about:apps r=margaret