config registry must be in sync with config manager

Change-Id: I63b0caaf9ee62b99d4364d31c728359139ba4a15