DATAJPA-578 - After release cleanups.