Merge proposals dependent on lp:kdocker

lp:kdocker has no merge proposals.