Merge branch 'master' into staging/electro-release

Conflicts:
	Gemfile
	Gemfile.lock
updating dependencies

metasploit-credential to pre.electro.pre.release
metasploit-data-models to 0.18.0

MSP-10654
Merge branch 'bug/MSP-10654/compatibility' into staging/electro-release
fix to_credential on core

the Metasploit::Credential::Core to_credential
method now seats private_type and realm_key correctly
Merge remote-tracking branch 'upstream/master'
android extension
android extension
formating
formating
fixing bugs
formating
Make XML export work with new backend

MSP-9948

* XML data looks ok in spot check
Use glob instead of entries

Fixes the case where a non-ruby file exists in the login_scanner/
directory
Land #3497, comma-separated get_cookies
reformatting the hash

MSP-10658
changing the private_type

chainging trys to show these may all come back nil.

MSP-10658
Merge branch 'feature/MSP-10658/to_credential' into staging/electro-release
Remove credentials exportation from XML

MSP-9948
Merge pull request #100 from rapid7/bug/MSP-10661/glob-rb-files

Use glob instead of entries
cleanup, deprecated