BUG 1037040 Python package manifests Windows support
minor formatting
Merge default -> production

--HG--
branch : production