Merge remote-tracking branch 'sm/sm-jb-mr1' into sm-jb-mr1-gcc48

Conflicts:
	tools/build-scripts/grouper-kernel-clean
	tools/build-scripts/mako-kernel
	tools/build-scripts/mako-kernel-clean