CONN-1082

- Fixed issue where Hibernate was not persisting new entities when id was preset.
- Removed flush statements in favor of letting container handle it automatically.
- Whitespace fixes (tabs to spaces, trimmed trailing space).