Merge "Do not parse Neutron error message to tolerate message changing"