Merge pull request #7830 from cachedout/develop

Add markupsafe to requirements file because it is required for salt-ssh.
Added self to AUTHORS.
Return None for the version and log a warning if the Postgres server cannot be reached. Refs #7695.