Description of problem:
in 3.6 broker.conf got moved to the shared storage and periodically copied to /var/lib/ovirt-hosted-engine-ha/broker.conf for caching purposes and to be able to send notification also when the shared storage goes down; during a 3.5 -> 3.6 upgrade, broker.conf got overwritten with initial defaults


Version-Release number of selected component (if applicable):
1.3.1.2

How reproducible:
100%

Steps to Reproduce:
1. upgrade form 3.5 to 3.6
2. check /var/lib/ovirt-hosted-engine-ha/broker.conf 
3.

Actual results:
broker.conf on the shared storage got written with the initial defaults

Expected results:
broker.conf on the shared storage got written with the values it had just before the upgrade.

Additional info:

Ho to fix the copy on the shared storage if it's already happened:
dir=`mktemp -d` && cd $dir
systemctl stop ovirt-ha-broker
sdUUID_line=$(grep sdUUID /etc/ovirt-hosted-engine/hosted-engine.conf)
sdUUID=${sdUUID_line:7:36}
conf_volume_UUID_line=$(grep conf_volume_UUID /etc/ovirt-hosted-engine/hosted-engine.conf)
conf_volume_UUID=${conf_volume_UUID_line:17:36}
conf_image_UUID_line=$(grep conf_image_UUID /etc/ovirt-hosted-engine/hosted-engine.conf)
conf_image_UUID=${conf_image_UUID_line:16:36}
dd if=/rhev/data-center/mnt/192.168.1.115:_Virtual_ext35u36/$sdUUID/images/$conf_image_UUID/$conf_volume_UUID 2>/dev/null| tar -xvf -
cp /etc/ovirt-hosted-engine-ha/broker.conf.rpmsave broker.conf # or edit broker.conf as you need 
tar -cO * | dd of=/rhev/data-center/mnt/192.168.1.115:_Virtual_ext35u36/$sdUUID/images/$conf_image_UUID/$conf_volume_UUID
systemctl start ovirt-ha-broker