Broader exception handling for invalid options in the salt command. Refs #8016.
Merge pull request #8731 from cachedout/#8016

Broader exception handling for invalid options in the salt command.