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