Merge remote-tracking branch 'origin/4.11'

Author: yadvr

scripts/util/keystore-cert-import

@@ -100,11 +100,6 @@ if [ -f "$SYSTEM_FILE" ]; then
     update-ca-certificates > /dev/null 2>&1 || true
 fi
 
-# Restart cloud service if we're in systemvm
-if [ "$MODE" == "ssh" ] && [ -f $SYSTEM_FILE ]; then
-    systemctl restart cloud > /dev/null 2>&1
-fi
-
 # Fix file permission
 chmod 600 $CACERT_FILE
 chmod 600 $CERT_FILE