Merge proposals dependent on lp://qastaging/~phill-ridout/openlp/more-bible-refactors

lp://qastaging/~phill-ridout/openlp/more-bible-refactors has no merge proposals.