Merge "Improve pep8 checks to be similar to those in nova"