5c9f704
container/cloud: sync the rest of the changes from f28 branch Signed-off-by: Dusty Mabe <dusty@dustymabe.com>