DATAJPA-522 - After release cleanups.