Fix bug 987219 - incorrect help for `rhc cartridge-list`
Fix bug 987336 - deprecate `sshkey delete`
Merge pull request #429 from liggitt/bug_987219_cartridge_list_help

Merged by openshift-bot
Merge pull request #430 from liggitt/bug_987336_deprecate_sshkey_delete

Merged by openshift-bot
Merge remote-tracking branch 'origin/master' into support_rhc_domain_list

Conflicts:
	autocomplete/rhc_bash