Pulling this back into branch-2 prevented nodemanagers from coming up if extended resources are present. This reverts commit ab83765a6c587f8378daed741f7d05598d076188.