AMBARI-5834. After upgraded to 1.6.0, Nagios server cannot start. Unit test fix. (swagle)
AMBARI-5859 Provide host specific aggregate metrics on Cluster resource (dsen)