CDAP-895 - Copy CDAP-641 fixes to release/2.5.0
Merge remote-tracking branch 'origin/release/2.5.0' into feature/cdap-895
Merge pull request #792 from caskdata/feature/cdap-895

CDAP-895 - Copy CDAP-641 fixes to release/2.5.0