Merge pull request #76 from ssirushchyshyn/develop

ZEN-10187: Revert the changes of a previous version
Merge pull request #21 from ssvsergeyev/develop

Fixes
ZEN-11287: Uncommented lines for making build in setup.py
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'zenoss/develop' into develop