DATAREST-417 - Adapt to type reorganization in Spring Data Commons.