Note: there is more cleanup to follow this. Namely, the vendored libraries should be further investigated and packaged individually as before, but including the variation that now exists in awscli after updating it.
