Fix CLI plugins to comply with PEP8 1.5.0
Fix OmeroPy CLI unit tests to comply with PEP8
Merge pull request #2209 from sbesson/rebased/develop/pep8_1.5.0

Pep8 1.5.0 (rebased onto develop)