Merge "Handle sigterm in nodaemon mode" into feature/zuulv3