Bugs/catch up with grizzly

This pull request represents a merge of code that has gone into the grizzly branch since the Havana branch was created.

Closes-Bug: #1206572
Closes-Bug: #1237066
Implements: blueprint/nagios-check-for-ceph