cleanup: start prepping for v3.12.x

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>