Resolved conflicts while merging master to dev
changed xplat repo name
Merge pull request #1354 from amarzavery/master

changed xplat repo name
Merge pull request #1355 from Azure/master

Integrating xplat repo name changes from master to dev
Merge branch 'dev' of github.com:Azure/azure-sdk-for-node into dev