Merge "registration: Improve duplicate config setting exception" into REL1_31
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 15 May 2018 23:54:23 +0000 (23:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 15 May 2018 23:54:23 +0000 (23:54 +0000)

Trivial merge