Merge "Fix config nodemgr configuration"