Merge proposals dependent on lp://staging/~hannes-georg-0/cloud-init/add_mkswap_force_flag

lp://staging/~hannes-georg-0/cloud-init/add_mkswap_force_flag has no merge proposals.