Merge proposals dependent on lp:~jimmy-jonsson-hiq/forssim/Bug_485691

lp:~jimmy-jonsson-hiq/forssim/Bug_485691 has no merge proposals.