DATAJPA-595 - After release cleanups.