QubesOS/qubes-issues#1311 (cherry picked from commit 7963fb91c7) Conflicts: rpm_spec/core-vm.spec vm-systemd/75-qubes-vm.preset
7963fb91c7
(cherry picked from commit 0ffa746678)
0ffa746678