Sync up V3 and V4 branches#91

GarrettBeatty merged 2 commits intodevaws/amazon-s3-encryption-client-dotnet:devfrom

gcbeatty/v3mergeaws/amazon-s3-encryption-client-dotnet:gcbeatty/v3mergeCopy head branch name to clipboard