Update prior to pull merge of minor changes to winproc.
Merge branch 'master' of github.com:zenoss/ZenPacks.zenoss.Microsoft.Windows

Conflicts:
	ZenPacks/zenoss/Microsoft/Windows/lib/txwinrm/__init__.py
	ZenPacks/zenoss/Microsoft/Windows/lib/txwinrm/collect.py