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

fix up spring to not load contexts to often