4c8188c rebase to latest upstream

Authored and Committed by Frantisek Kluknavsky 6 years ago
    rebase to latest upstream
    docker-oci-umount renamed to oci-umount
    docker depends on oci-umount, not vice-versa
    
        
file modified
+1 -0
file modified
+13 -6
file modified
+1 -1