JSDoc comments for mpns notification and cleaning up some old merge conflict notes for HDInsight

Fixed up/added some comments for MPNS notifications and removed some old <<<<<<< HEAD comments from merge conflicts.