REP-712 Improve Health Check Service API

Branched off of master.

Reference #1026 for a version a few commits behind branched off of the spring branch.
This opens us up to unexpected NPE's. I don't think we want to write all the null safety code, so maybe make sure the map is one that doesn't allow null as a key, and flip this condition.