Merge branch 'devel-2.6'

* devel-2.6:
  ensure-dirs: Don't accept arguments
  ensure-dirs: Fix program name on usage screen
  cli: Fix small typo

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>