Merge remote-tracking branch 'zenoss/develop' into develop
Moved hepler functions to the end of the module, pep8

The scope of ZEN-11692.