Merge proposals dependent on lp://qastaging/~suutari-olli/openlp/fix-openlp-importer

lp://qastaging/~suutari-olli/openlp/fix-openlp-importer has no merge proposals.