Merge pull request #11176 from schneems/schneems/plugin_new_help_fix

Fix `rails plugin --help`
Conflicts:
	railties/CHANGELOG.md