Include additional upstream changes to postinst

This mostly removes a bunch of vestigal stuff and stops overwriting
/etc/dpkg/origins/default every upgrade.

Change-Id: Ia6fe76f691118c81a450cc997602ee8a33ffe2cd