PDI-9393 Get code up to PDI5 logging spec