Do not pass haproxy option to the provisioning scripts in HA setup,
 	As the setup_ha task takes care of configuring VIP and VIP will be used instead of 127.0.0.1.

Change-Id: I21380cdb1355d0036e812bac2df70378609f0911
Merge " Do not pass haproxy option to the provisioning scripts in HA setup,  	As the setup_ha task takes care of configuring VIP and VIP will be used instead of 127.0.0.1."
Merge remote-tracking branch 'upstream/master'