Improve quota awareness#4

ianfixes wants to merge 6 commits intopcreux:masterpcreux/aws-rotate-keys:masterfrom

ianfixes:2021-01-06_quota_awarenessianfixes/aws-rotate-keys:2021-01-06_quota_awarenessCopy head branch name to clipboard