Prepare for 2.1 release branch of gsb_public.