DATACMNS-379 - Adapt to changes in Spring Data Commons.