Merge branch 'master' into interface-checks

diff --cc plugins/ipam/host-local/backend/disk/backend.go
index 106c2da,703ec09..9c11699
--- 1/plugins/ipam/host-local/backend/disk/backend.go
--- 2/plugins/ipam/host-local/backend/disk/backend.go
+++ b/plugins/ipam/host-local/backend/disk/backend.go
@@@ -20,8 -20,7 +20,9 @@@ import 
        "net"
        "os"
        "path/filepath"
+       "strings"
 +
 +      "github.com/containernetworking/cni/plugins/ipam/host-local/backend"
  )
  
  const lastIPFile = "last_reserved_ip"