update unit tests to fix failures on CI machines.
Merge branch 'release' of https://github.com/gcheng/azure-sdk-for-java into release

Conflicts:
	microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java
fix a broken unit test on CI machine.