Merge "Fix missing usage of the xml neutron clients"