Merge "BUG-1520 coverage tests for config-manager"