Merge debian master

This merge request contains all the commits since 2.7.1 from debian/master into collabora/master branch. Solved conflicts and ship our patches into a collabora subdir. debian/changelog are refined with the subject from commits with original authors.