Backport caskdata/cdap#767 for Docker support
Merge pull request #778 from caskdata/feature/docker-cdap25

Backport caskdata/cdap#767 for Docker support