Merge "Re-enable E305 pep8 errors" into feature/zuulv3