Remove cdap from common-cli package