Merge "fix webapp tests for py3" into feature/zuulv3