Merge pull request #15273 from calavera/remove_new_key_path_on_error

Remove key file when migration fails.

docker/daemon.go

@@ -100,6 +100,7 @@ func migrateKey() (err error) {
 				err = os.Remove(oldPath)
 			} else {
 				logrus.Warnf("Key migration failed, key file not removed at %s", oldPath)
+				os.Remove(newPath)
 			}
 		}()