Merge pull request #1450 from brucehoff/PLFM-2922

PLFM-2922
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
once again, spring transactions don't like exceptions
Merge pull request #1463 from marcel-blonk/PLFM-2927-r53

once again, spring transactions don't like exceptions
Merge branch 'release-53' into develop