Merge proposals dependent on lp://qastaging/~raoul-snyman/openlp/refactor-mock

lp://qastaging/~raoul-snyman/openlp/refactor-mock has no merge proposals.