admincli improvements

2 jobs for !150 with admincli-improvements in 1 minute and 33 seconds (queued for 2 seconds)
latest merge request