Merge branch 'release/2.0.0'
Merge branch 'develop' of github.com:zenoss/zenoss-utils into develop