[2.9] NX-459: Backport KZ Timeline

Backport KZ Timeline

Issue
https://issues.sonatype.org/browse/NX-459

CI
http://bamboo.s/browse/NX-OSSF73