Encryption changes for StorSimple

Encryption changes for StorSimple
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/AzurePowershell.sln
Merge branch 'dev' of https://github.com/AzCiS/azure-sdk-tools into dev

Conflicts:
	src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DataContainer/NewAzureStorSimpleDeviceVolumeContainer.cs