(cherry picked from commit 5c016d6a)
Conflicts:
	solenv/flatpak-manifest.in

Change-Id: I7799abe1a6fc9cf79a751d76360ea7ad2face133
Reviewed-on: https://gerrit.libreoffice.org/57981Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit b36c5676)