Add 'jid' back in as None to prevent KeyErrors
Move the no minion check so it doesn't eclipse no master check
Merge pull request #3779 from basepi/nominions

Fix errors in Pull Request #3777