fix: Undo squash merge, fix merge from mainline#210

Merged

acioc merged 11 commits intoaws:keyringfrom

Aug 6, 2020

Commits on May 26, 2020

fix: validate entire ciphertext has been processed before returning (#191)
WesleyRosenblum
authored
Updating version for 1.6.2 release (#192)
WesleyRosenblum
authored

Commits on Aug 6, 2020

Revert "fix: Merge mainline into keyrings, revert the keyring reverts (#209)"
Alex Cioc
committed
Merge branch 'master' into keyring
Alex Cioc
committed
Revert "Merge pull request #189 from mattsb42-aws/revert"
Alex Cioc
committed
Replace failing Assert.fails with assertThrows per earlier PR changes
Alex Cioc
committed