some updates on the HDInsight articles
fixed merge conflict for #1294
Merge pull request #1299 from pennij/working_tues0507

Fixed merge conflict for #1294