Merge "Remove redundant injected SitePaths in IT tests"