Bring SCons integration up to date with latest incoming and fix some SCons build reliability issues and races