taking changes from 1.2 to stop service

Still broken in 1.5.x on CentOS 6.