More fixes to install_and_test_tool_shed_repositories for session globals going away.
Merge latest central.