fix pylint issues in Flo & RAET
Merge branch 'pylint' of https://github.com/hulu/salt into hulu-pylint

Conflicts:
	salt/client/raet/__init__.py
	salt/daemons/flo/worker.py
Merge pull request #16297 from thatch45/hulu-pylint

Merge #16280