Merge "fix SERVER_FQDN MDC for audit log"