Fix for an exception that was causing the salt minion not to start up properly.
Merge pull request #16625 from garethgreenaway/function_error_broken_minion

Fix to minion.py
false positive due to pylint bug
relatively safe
Merge branch 'develop' into with-pylint-pragmas