PDI-9393 Get code up to PDI5 logging spec
PDI-9393 Get code up to PDI5 logging spec
Merge branch 'master' into sprint_3