Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
up to date
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
up to date
Fixed issue downloading XML reports

The XML report has an extra </report> tag which prevents the .text
method from working properly. I used the .to_s method instead.

I also moved the rescue statement because it was masking other errors
that were being raised.
Handle single quotes for OpenVAS import
Merge branch 'master' of https://github.com/averagesecurityguy/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
up to date
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Fix sap ni proxy, hopefully