Fixes #4321 - Add bundle to restart services at some conditions
Refs #4321 - Change service_restart to wrap service_restart_if and add tests