Ensure slugs don't collide when renaming a server
Ensure we save the upgrade even if no change occurred, so it doesn't get cleaned up with no reason