flake8 fixes to core files
Merge remote-tracking branch 'origin/dev_5_0' into flake8-fixes-core

Conflicts:
	components/tools/OmeroPy/test/integration/library.py
Merge pull request #2278 from ximenesuk/flake8-fixes-core

Integration tests - flake8 fixes to core files