Merge branch 'develop' into feature/devtype

Conflicts:
	ZenPacks/zenoss/Microsoft/Windows/__init__.py
Merge branch 'develop' into feature/devtype

Conflicts:
	ZenPacks/zenoss/Microsoft/Windows/__init__.py
Merge pull request #56 from zenoss/feature/devtype

Please review branch feature/devtype