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