Adds --show-jid to print the jid without the additional output of --verbose
Adds -sj as shortened version of --show-jid
Removes broken -sj short option
Adds show_jid option to master config
Simple pyline whitespace fix
Merge pull request #12026 from iquaba/show-jid

--show-jid