Merge pull request #2730 from atkach/AMBARI-25052-trunk

AMBARI-25052 Unable to Add Services Due to toMapByProperty()