Merge branch 'master' into old-restore

Author: bexsoft

portal-ui/src/screens/Console/Console.tsx

@@ -213,6 +213,9 @@ const Console = ({
         serverNeedsRestart(false);
       })
       .catch((err: ErrorResponseHandler) => {
+        if (err.errorMessage === "Error 502") {
+          serverNeedsRestart(false);
+        }
         serverIsLoading(false);
         console.log("failure restarting service");
         console.log(err);