This change includes the fix at
https://github.com/alpinelinux/apk-tools/commit/6484ed9849f03971eb48ee1fdc21a2f128247eb1

Signed-off-by: Nolan Brubaker <nolan@heptio.com>