Initial support for hibernate
Merge small changes into my local copy.`Merge branch 'master' of https://github.com/iris-email-client/iris-base-j8