Force reset of Plasma-desktop 5.15

[David Edmundson]

Someone merged master into the 5.15 branch
It needs to be force reset. Please don't push anything in either right now.

David