SW-98. Minor fixes, mostly for removal of site_scons utility module.