common: fix pep8 and compat issues on RHEL6.5