Moving this back to fix released (since the backport is done) and dealing with kaa-base in Bug #288985.
Moving this back to fix released (since the backport is done) and dealing with kaa-base in Bug #288985.