jsdoc comments for mpns notifications
cleaning up some old merge conflict indicators
mpns service was incorrectly linked to type gcmservice. fixed.
Merge pull request #996 from Blackmist/docs

JSDoc comments for mpns notification and cleaning up some old merge conflict notes for HDInsight
Merge remote-tracking branch 'upstream/dev' into dev