Fix various Hibernate mapping oversights.

Change-Id: Iff22c68a718d6f65734e166cd08f4049ccc196ec
3 files changed