Merge "Fix gc_log when running in a web container" into stable-2.11