Fix CVE-2020-4054 in unstable and merge packaging
Merge in the NMU changes to address CVE-2020-4054 and resolve issues with merging into master due to already pending packaging changes.
Merge in the NMU changes to address CVE-2020-4054 and resolve issues with merging into master due to already pending packaging changes.