BUG 1029668 Windows support for users manifests; r=dustin
Merge default -> production

--HG--
branch : production