AMBARI-3073. Amabri Client refactoring -2. (Subin via mahadev)