Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev