Merge branch 'hotfix/mavenversions'
Merge branch 'develop' of github.com:zenoss/zenoss-protocols into develop