#2839 preliminary integration of several HiveAdministrator related improvements from #2877 (full merge pending)