DM-207: migrated to the new logging system.

This is a squashed version, for individual commits see u/jbecla/DM-207
fixed alignment