[releng] Sync buildbranched and buildrawhide a little