uses fail_with to bomb out on datastore probs
unretards the uri normalize loop
Merge logic cleanups from kernelsmith
Land #2969, random name generator for phishing
Land #3047 for real.
Merge branch 'land-3047-really' into upstream-master
Fix NameError for "r" in Msf::Auxiliary::Nmap

Wasn't in scope.
Fix ActiveRecord::ConnectionNotEstablished

[SeeRM #8780]
Land #3173, Fix ActiveRecord::ConnectionNotEstablished
Land #3155 - Explib2
Update and rename myBB_GetTypeDB.rb to mybb_get_type_db.rb
Add MSB number to name
Land #3161, name changes for IE modules
Microsoft module name changes

So after making changes for MSIE modules (see #3161), I decided to
take a look at all MS modules, and then I ended up changing all of
them. Reason is the same: if you list modules in an ordered list
, this is a little bit easier to see for your eyes.
Update spec for #3162
Land #3162, Microsoft module name changes
Fixup on some modules for release

There may be more coming, but if not, this should cover
this week's minor style changes.
Land #2928, extended SMTP open relay checks
Land #2929, DNS recursion amplification scanner
Land #3159, HP LaserJet printer SNMP enumeration
Merge up from upstream/master