Change hardcoded default to 20s.
Merge pull request #96 from xschildw/master

PLFM-1479
Merge branch 'release-1.7'
Merge branch 'release-1.12'
updated README.md
Merge pull request #1383 from john-hill/PLFM-2850-b

Plfm 2850 b
pre-test
spring changes to make sure most files are loaded only once
test fix
test fix
make test more repeatable
PLFM-2857
Merge pull request #1390 from brucehoff/PLFM-2857

PLFM-2857
Remove duplicate dependency on spring-core
Remove duplicate dependency on junit
Add missing version for maven-exec-plugin

This plugin is used in several subprojects, and in all of them except
the repository services it is always declared with it's version.
PLFM-2859
Merge pull request #1389 from marcel-blonk/PLFM-2847

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

Plfm 2853