Populate QueryClientTestRun dataset
Fix cdap-cli packaging
Merge branch 'develop' of github.com:caskdata/cdap into feature/populate-queryclienttest-ds

Conflicts:
	cdap-client-tests/src/test/java/co/cask/cdap/client/QueryClientTestRun.java
Merge pull request #537 from caskdata/feature/fix-cli-pkg2

CDAP-455 Fix cdap-cli packaging
Merge pull request #460 from caskdata/feature/populate-queryclienttest-ds

(CDAP-30) Populate QueryClientTestRun dataset
Merge branch 'develop' of github.com:caskdata/cdap into feature/CDAP-412-ListServiceEndpoints