Merge pull request #1456 from marcel-blonk/PLFM-2923

cannot ignore deadlock exceptions, they implicitely roll back