Merge "Make ZuulDaemonApp an abstract base class" into feature/zuulv3