use https for zenoss server
Merge branch 'develop' into fix/zen-12212
Merge pull request #322 from zenoss/fix/zen-12212

Fix/zen 12212