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
2 more cases from Cloudwatch
simple logging service
PLFM-2922
Merge pull request #1450 from brucehoff/PLFM-2922

PLFM-2922
log user agent and client defined label
Merge pull request #1447 from marcel-blonk/PLFM-2879

simple logging service
one less dimension needed
Merge pull request #1451 from marcel-blonk/PLFM-2879

one less dimension needed
PLFM-2898
Merge pull request #1453 from brucehoff/PLFM-2922

PLFM-2922
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into PLFM-2898
cannot ignore deadlock exceptions, they implicitely roll back
test for parallel inserts of activities
remove println
Merge pull request #1456 from marcel-blonk/PLFM-2923

cannot ignore deadlock exceptions, they implicitely roll back