Issue #3271144 by kunal.sachdev, phenaproxima, tedbow: Ensure new, changed or deleted service definitions are in the correct state after an update