Merge "Handle properly 404 responses from Neutron"