Merge "Add parameter to manage usage of Neutron l3_ha option"

diff --cc compute-config.yaml
Simple merge

diff --cc controller-config.yaml
Simple merge

diff --cc controller.yaml
Simple merge

diff --cc nova-compute-config.yaml
Simple merge

diff --cc overcloud-source.yaml
Simple merge

diff --cc overcloud-without-mergepy.yaml
Simple merge