Patch back to pre-1444

This is an attempt to resolve the problems noticed in #1476 by patching
back to the point before #1444.

Note that #1444 was landed in a way that seems to be complicating a
straight revert. Probably don't want to revert a merge commit from that
branch anyway because that has the effect of permanently shunning that
branch forever.

Once the best solution is chased down to resolve #1476, start by reverting this one commit, and patching from there. That /should/ keep your history straight.

For reference, here's the strategy used to make this branch:

````
Merge was e13f16c
Last commit in master before the twisty merges was d5b0482

$ git diff e13f16c d5b0482 > /tmp/undo-pull-1444.diff
(bugs/revert-1444) todb@mazikeen:~/git/rapid7/metasploit-framework
$ patch -p1 < /tmp/undo-pull-1444.diff
patching file lib/anemone/rex_http.rb
patching file lib/msf/core/auxiliary/crawler.rb
patching file lib/msf/core/auxiliary/web/http.rb
Hunk #5 succeeded at 296 (offset 3 lines).
patching file lib/msf/core/exploit/http/client.rb
patching file lib/msf/core/exploit/mixins.rb
patching file lib/msf/core/exploit/winrm.rb
patching file lib/rex/proto/http/client.rb
patching file lib/rex/proto/http/request.rb
patching file modules/auxiliary/gather/shodan_search.rb
patching file modules/auxiliary/scanner/http/cisco_device_manager.rb
patching file modules/auxiliary/scanner/http/http_login.rb
patching file modules/auxiliary/scanner/winrm/winrm_cmd.rb
patching file modules/auxiliary/scanner/winrm/winrm_login.rb
patching file modules/auxiliary/scanner/winrm/winrm_wql.rb
patching file modules/auxiliary/server/http_ntlmrelay.rb
patching file modules/exploits/linux/http/piranha_passwd_exec.rb
patching file modules/exploits/multi/http/axis2_deployer.rb
patching file modules/exploits/multi/http/jboss_bshdeployer.rb
patching file modules/exploits/multi/http/jboss_maindeployer.rb
patching file modules/exploits/multi/http/tomcat_mgr_deploy.rb
patching file modules/exploits/unix/webapp/oracle_vm_agent_utl.rb
patching file modules/exploits/windows/http/easyftp_list.rb
patching file modules/exploits/windows/http/xampp_webdav_upload_php.rb
patching file modules/exploits/windows/winrm/winrm_script_exec.rb
(bugs/revert-1444) todb@mazikeen:~/git/rapid7/metasploit-framework

````