Revert "Merge branch 'develop' of github.com:caskdata/cdap into feature/cli-start-runtimeargs"

This reverts commit d0768f705e787cecb4753a09331c71a03a645462, reversing
changes made to 34ad69eed8f5703d1d48df4f936a5281a289be6d.