Kill service on RPC disconnect

We were not properly handling RPC disconnect.  On RPC disconnect the service was SIGTERM'd, then immediately SIGKILL'd when the container was shutdown due to the controller exiting.  Following this change we give the service 30 seconds to respond to SIGTERM before killing it.