DATAJPA-604 - After release cleanups.