Bug 860494 - Windows build bustage fix. r=me CLOSED TREE
Bug 856572 - Fix popup dialog text. r=mfinkle a=bajaj