Merge pull request #31 from zenoss/feature/ZEN-9726

fixes ZEN-9726
Release: Version 1.0.2dev -> 1.1.0
Merge branch 'release/1.1.0' into develop
Post Release: Version 1.1.0 -> 1.1.1dev
fixes ZEN-15245
Merge pull request #32 from zenoss/feature/ZEN-15245

fixes ZEN-15245
ZEN-9726 updates