Merge pull request #5162 from JensRantil/fix-corrupt-module-outputs

More don't catch `SystemExit`

monitoring/nagios

@@ -214,7 +214,7 @@ def main():
             m = int(minutes)
             if not isinstance(m, types.IntType):
                 module.fail_json(msg='minutes must be a number')
-        except:
+        except Exception:
             module.fail_json(msg='invalid entry for minutes')
 
     ##################################################################

packaging/apt_key

@@ -138,7 +138,7 @@ def download_key(module, url):
             module.fail_json("error connecting to download key from url")
         data = connection.read()
         return data
-    except:
+    except Exception:
         module.fail_json(msg="error getting key id from url", traceback=format_exc())