Merge pull request #525 from WindowsAzure/master

Sync dev up with v0.6.9 release
Merge pull request #531 from andrerod/errors

Errors
Merge pull request #537 from andrerod/dev

#503: Update xml2js to version 0.2
Initial commit to factoring out mock server
Fix
Merge pull request #18 from andrerod/mock

#527: Factor out mock server to a separate module
#549: Failing UT
Merge remote-tracking branch 'upstream/dev' into dev
Uncomment UT
Remove file
Correct function name
Merge pull request #553 from andrerod/dev

Merging old changes