DATAJPA-587 - After release cleanups.