Fix sorting
Merge branch 'release-0.7.0' of https://github.com/WindowsAzure/azure-sdk-tools-xplat into release-0.7.0