PLFM-2857
Merge pull request #1390 from brucehoff/PLFM-2857

PLFM-2857
Merge pull request #1389 from marcel-blonk/PLFM-2847

fix up spring to not load contexts to often