DDF-658: Moved code to catch exception report XML and report WFSException
DDF-658: Merge conflict changes