Merge pull request #2741 from akoeplinger/acceptance-tests-split