add additional logging and streamline code path to put node back into service
merge