Grouper/Tilapia:  Disable c++11 mode when not using build scripts
Merge remote-tracking branch 'sm/sm-jb-mr1' into sm-jb-mr1-gcc48

Conflicts:
	BoardConfigCommon.mk