v31.0rc2
move-only: move logging categories to logging/categories.h
logging: use util/log.h where possible