Merge "remove service-type from neutron extension list"