Imported Debian patch 2.20.1-5.7
Merge tag 'debian/2.20.1-5.7'

Debian release 2.20.1-5.7
Reinstate blkid.conf
Reinstate upstart-based hwclock support
Update changelog
Ensure /sbin/blkid is installed in initrd