Fix cdap-cli packaging
Merge pull request #544 from caskdata/feature/fix-cli-pkg3

CDAP-455 Fix cdap-cli packaging