BZ917491 - [ORIGIN]oo-register-dns on broker has duplicate options

[merge] plz