Merge "Switch to using Oslo logging"