Merge "Skip tests when neutron extension trunk is absent" into mcp/xenial/rocky