Merge "registration: Improve duplicate config setting exception" into REL1_31