more last-minute fixes
Merge branch 'release/2.5.0' of github.com:caskdata/cdap into release/2.5.0