Merge proposals dependent on lp:~kvilhaugsvik/qbzr/qshelve_all

lp:~kvilhaugsvik/qbzr/qshelve_all has no merge proposals.