Bug 1032391 - update unzip on mac os x build/test machines to 6.0 - with ubuntu fix, r=dustin
merges default -> production
Bug 942468: correct landing of qa-config.pp; r=Callek
Merge default -> production