cli help formatting fixes
Merge branch 'develop' into local-configs