[Bug 1130270] File conflicts on TW upgrade 20190315-0 -> 20190320-0 kernel-default-5.0.2-1.2.x86_64 and kernel-default-base-5.0.2-1.1.1.5.x86_64