Merge "Keep ERROR_* constants in ApiStashEdit for backwards compatibility"