Cumulative debian patches 2.1.1-17.2 (circa debian-specific stuff)

By Matthias Urlichs and debian project maintainers/contributors