Merge "Don't reject "ctl.stop.*" during shutdown." into main