Merge "Skip os-fixed-ips test since neutron has not implemented it"