AMBARI-6124. Ambari Shell improvements