Merge agent rpm ownership fix from https://issues.apache.org/jira/browse/AMBARI-1870