catch connection error
Merge branch 'develop' of github.com:zenoss/zenoss-prodbin into feature/ZEN-15116

Conflicts:
	Products/Zuul/facades/metricfacade.py