AMBARI-2158 - Certain queries with metrics takes a long time (3 minutes on a 450-node cluster)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1483967 13f79535-47bb-0310-9956-ffa450edef68