bump: v3.9-rc4+ and pull in merge patches

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