Merge proposals dependent on lp:~vila/bzr/856261-unshelve-line-based

lp:~vila/bzr/856261-unshelve-line-based has no merge proposals.