Merge "Fix small resource leak in config-manager."