PROV-601 Adjust xml output to pass schema check