Fix the brittle errorstring-to-httperror recognition code Upstream-commit: 84ed18827a5903c7df61146a8fd716e8245830e7 Component: engine