Don't use java 7 exceptions yet
use ConflictingUpdateException
Merge pull request #1535 from marcel-blonk/PLFM-3019

Don't use java 7 exceptions yet