Merge "Tidy up README.rst" into feature/zuulv3