Correctly remove containers and volumes on cleanupSigned-off-by: Steve Kuznetsov <skuznets@redhat.com> (commit: 98fe1b1)