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
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
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
Keep better track of resources

[See #1623]
[SeeRM #7692]
Move deletion into #remove_resource

Doing it here means that modules manually calling remove_resource won't
screw up the cleanup
Add a method for dealing with hardcoded URIs