Merge "Fix ConfigManager unit test."