Merge develop into release/2.6.0

Once this is merged, we can merge release/2.6.0 into develop, as per https://issues.cask.co/browse/CDAP-770.