Mark /etc/openshift/broker-dev.conf as config-noreplace.
Merge pull request #3989 from kraman/bugfix3

Merged by openshift-bot