Squashed 'site_scons/' changes from 2e4403b..532242f

532242f To workarounds buggy scons replace --test_runner with --runner

git-subtree-dir: site_scons
git-subtree-split: 532242ffc70fe3e81c1f03952fafd17cb0452f7b
Merge commit '3b5afdf958c66b2dbe95cedf3f1d0a47bd4f889a'