Fixed simple grammar error in the MediaLocation help message
specify null for server farm to allow site creation instead if API error
Merge pull request #2994 from ytechie/patch-1

Fixed simple grammar error in the MediaLocation help message
Merge pull request #3036 from galcho/master

specify null for server farm to allow site creation instead if API error
Revert "specify null for server farm to allow site creation instead if API error"
Merge pull request #3048 from Azure/revert-3036-master

Revert "specify null for server farm to allow site creation instead if A...
Merge pull request #3049 from Azure/master

Merge master into dev