Release/2.6.0

These changed were reviewed and given LGTM here: https://github.com/cdap-guides/cdap-spark-guide/pull/14

The idea here is to have develop branch against a released version and all ongoing work on another branch which we will merge when we release. 

These branch will be merged to develop when we release 2.6.0