DATAJPA-557 - After release cleanups.