Spring data plus hibernate

Hopefully this one will just merge, it's a combination of a cherry-pick of the two commits that you made to Spring-Data plus the local one I had.