AMBARI-1613. ConfigurationResourceProvider doesn't properly handle OR predicates

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