Crog/jpa config update

A new PR against master instead of old gutterball-hibernate branch.

Old PR is #750
The alternative is to make Candlepin the same. My problem is the inconsistency not the implementation of ```toMap```. So if ```toMap``` is preferred, then make Candlepin also use it. But having them be different causes confusion.