Update catalog, plan, service validation errors

[Finishes #62854062]