Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'