AMBARI-5707. Metrics system prototype implementation. Aggregator code fix. (swagle)