Merge "Update log config to log4js format"