[scons] Merge branch 'personal/stbuehler/scons-cleanup'