BZ917491 - [ORIGIN]oo-register-dns on broker has duplicate options
Merge pull request #1567 from calfonso/master

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