Merge "Plumb through keep jobdir option" into feature/zuulv3