Merge pull request #324 from gcheng/dev

Dev
Merge pull request #329 from gcheng/dev

Dev
Merge pull request #332 from gcheng/dev

Dev
Merge pull request #334 from gcheng/dev

Dev
Merge pull request #338 from gcheng/dev

Dev
Merge pull request #39 from gcheng/release

Release
Merge pull request #342 from WindowsAzure/dev

Dev
Merge pull request #343 from gcheng/dev

Dev
fix two scenario tests for CI machine.
Merge pull request #40 from gcheng/cibugfix

bug fix in CI machine.