Fixes #60920 and #6093 - aliasing resources and better option descriptions

Requires https://github.com/theforeman/hammer-cli/pull/116