Merge "Make Openstack Network Service names editable"