DATAJPA-636 - After release cleanups.