Merge "(bug 42226) failure in sites tests"