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

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