DATAJPA-563 - After release cleanups.