Fix for https://issues.cask.co/browse/CDAP-893.
Merge pull request #800 from caskdata/feature/r2.6.0_admin_fix

Fix for https://issues.cask.co/browse/CDAP-893.