No bug: remove temporary node; a=nodechange
Bug 1032391 - update zip and unzip on mac os x build/test machines to 6.0, r=dustin
merges default -> production
BUG 1048766 Disabel Server initialization logon Window; r=dustin
Merge default -> production