Depend on xunit.execution so test projects don't have to
Merge upstream changes