merge with v3.7.x branch and angstrom

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

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