deprecate old custom topics for Ohai 6; add new