DATAJPA-522 - Forward port changelog entries from bugfix branch.