backport https://github.com/cloudera/cdk/pull/22