Merge proposals dependent on lp://qastaging/~phill-ridout/openlp/media-path-fixes

lp://qastaging/~phill-ridout/openlp/media-path-fixes has no merge proposals.