2 more cases from Cloudwatch
Merge pull request #1450 from brucehoff/PLFM-2922

PLFM-2922
PLFM-2898
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
remove obsolete test
Merge pull request #1457 from marcel-blonk/PLFM-2923

remove obsolete test
cannot ignore deadlock exceptions, they implicitely roll back
Merge pull request #1458 from marcel-blonk/PLFM-2923-r53

cannot ignore deadlock exceptions, they implicitely roll back
PLFM-2898
PLFM-2898
Merge pull request #1452 from brucehoff/PLFM-2898

PLFM-2898
fix test to actually test what it says
Merge pull request #1459 from marcel-blonk/PLFM-2923

fix test to actually test what it says
validate and normalize default and enum values
test not needed here
Merge pull request #1460 from marcel-blonk/PLFM-2712

validate and normalize default and enum values