DATAJPA-542 - After release cleanups.