KRACOEUS-8236: JPA maPPing fix
Merge pull request #1031 from jwillia/KRACOEUS_8236_1

KRACOEUS-8236:fixed user attached forms with attachments
KRACOEUS-6956: Removing whitespace
Merge pull request #1038 from gathreya/SQLFix

KRACOEUS-6956: Removing whitespace