Merge branch 'JBX' into 'JBX_EDISON'
updated build script system
build scripts: Final settings for EDISON