Merge remote branch 'vova/develop' into develop
Merge pull request #161 from ssvsergeyev/develop

Fixed ZEN-11318 issue
Merge remote branch 'zenoss/develop' into develop
ZEN-10939 fix KeyError with mssqlinstance
Merge pull request #37 from ssbunyk/develop

Fix for ZEN-10939