Fix pep8 formatting to fix cloudstack-marvin build