Updated model with IIS component.
Merge branch 'master' of github.com:zenoss/ZenPacks.zenoss.Microsoft.Windows into modelupdate

Conflicts:
	ZenPacks/zenoss/Microsoft/Windows/configure.zcml
Make file addition and src for txwinrm
Merge branch 'master' of github.com:zenoss/ZenPacks.zenoss.Microsoft.Windows

Conflicts:
	ZenPacks/zenoss/Microsoft/Windows/modeler/plugins/zenoss/winrm/WinServices.py
	ZenPacks/zenoss/Microsoft/Windows/txwinrm/collect.py
	ZenPacks/zenoss/Microsoft/Windows/txwinrm/enumerate.py