Merge "Replace directly import of logging with import oslo_log"