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