Merge "Various fixes to the deb_dpkg build script"