Merge "Copy dirs to handle __pycache__ in py3" into feature/zuulv3