[MIG] Translated changes from 7.0 branch

After the PEP8 fix. Also a new module for 7.0 lands in `__unported__` dir.
This is because I have copied as is from 7.0. In 7.0 must be this line. I'm removing it.