scripts: merge changes

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

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