patch TPS-678 : [5.3.1] HL7 repository parse issues (TDI-24882,
TDI-29999)