CDAP-455 Fix cdap-cli packaging

Merged to develop already, also merging to release/2.5.0