dpkg 1.17.21

Version bump, rebased the patch against the latest release and
externalised it, adds some inreplaces discussed with upstream to fix
compile issues, and adds a test.