Disabled find-by-unique-column-set in persist()
Merge branch 'master' of github.com:sosandstrom/mardao
Adjusting for JDK8