[releng] routine back port of fixes in scripts to maintenance