Squashed 'floo/common/' changes from 160ad1a..bbeaa11

bbeaa11 Minor cleanup and pyflakes/pep8

git-subtree-dir: floo/common
git-subtree-split: bbeaa11ce366e7ae66f06d5efb8f8e75be610c01
Merge python common. Fix conflict.