pre-test
spring changes to make sure most files are loaded only once
test fix
test fix
make test more repeatable
Merge pull request #1389 from marcel-blonk/PLFM-2847

fix up spring to not load contexts to often
Merge pull request #1388 from john-hill/PLFM-2853

Plfm 2853
merged