changes related to upstream merging

Ref TheWeatherCompany/dasein-cloud-aws#62
Ref TheWeatherCompany/dasein-cloud-core#42