fixing broken admin cli 'help' command
Merge branch 'v1.9.x' into next
Merge branch 'next' into sam_97