Merge pull request #4871 from UtahDave/develop

fix incorrect indentation on except clause
fix typo: critera => criteria
Merge pull request #4872 from cvrebert/patch-3

fix typo: critera => criteria
Simplify dnsutil._has_dig()
fix pylint W0120: Else clause on loop without a break statement

for-else is also a pretty obscure construct
Merge pull request #4877 from hulu/for-else-fix

fix pylint W0120: Else clause on loop without a break statement
Merge pull request #4874 from cvrebert/patch-2

Simplify dnsutil._has_dig()