Eliminate `enable` logic conflict
Eliminate `enable` logic conflict

Fixes saltstack#20915

Modifies `service.running` and `service.dead` to update the `ret`
variable based on the return value of `_enable()` or `_disable()`.
Modifies `_enable()` and `_disable()` so they return a dict that only
contains keys changed by the referenced function (rather than a full
state dict).

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt