Solar backports 2.2 patches for usage in 2.0.38

Solar has released patches to ensure some daemons are not returned to state, so that they do not expose security vulnerabilities. This patch having been in 2.2.12, has recently been backported to the 2.0.x series.