Fixed shutdown getting stuck
More complete upgrade users. For some reason, setProperty does not set the property for nodes in the upgradeUsers function in production