Merge pull request #3825 from RosettaCommons/dougrenfrew/update-scons-local Dougrenfrew/update scons local