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

CDAP-455 Fix cdap-cli packaging
Fix cdap-security-service dependencies
Addressed comments
Merge pull request #556 from caskdata/feature/fix-security-service-exclusions-2.5

CDAP-478 Fix cdap-security-service dependencies
Merge pull request #566 from caskdata/release/2.5.0

Merge Release/2.5.0 into develop