Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	.nuget/windowsazure.mediaservices.nuspec
	ci/AssemblyInfo.cs
	src/net/Client/Common/Common.BlobTransfer/Properties/AssemblyInfo.cs
	src/net/Client/Common/Common.BlobTransfer/Properties/DelaySign_AssemblyInfo.cs
	src/net/Client/Common/Common.FileEncryption/Properties/AssemblyInfo.cs
	src/net/Client/Common/Common.FileEncryption/Properties/DelaySign_AssemblyInfo.cs
	src/net/Client/Properties/AssemblyInfo.cs
	src/net/Client/Properties/DelaySign_AssemblyInfo.cs
	test/net/Scenario/Properties/AssemblyInfo.cs
	test/net/unit/Properties/AssemblyInfo.cs