minor style for for len usage and one "== None" occurrence
one mistake with len > 1
Merge pull request #11254 from mikar/develop

minor style fix for len usage and one "== None" occurrence
fix missing code-block formating
Merge pull request #11258 from pille/patch-3

fix missing code-block formating
Merge pull request #11252 from gtmanfred/apache

Apache configuration files
Fixed salt states iptables implementation so you can safely test it without getting changes applied
Fixed a bad variable name
Merge pull request #11264 from carlosperello/iptables-fix-test

Fixed salt states iptables implementation so you can safely test it with...
add functions for generating passwords

and salted hashes. #11256