Merge pull request #1567 from calfonso/master

BZ917491 - [ORIGIN]oo-register-dns on broker has duplicate options
BZ873896 - [ORIGIN] 000001_openshift_origin_node.conf not included in gemspec, but is in tar.gz