Merge branch 'staging/electro-release' of github.com:shuckins-r7/metasploit-framework into staging/electro-release
Merge branch 'android_ext2' of github.com:AnwarMohamed/metasploit-framework into anwar-android-bins
Revert to file-based solution.
Change filename to calllog_dump.
Merge pull request #4 from jvennix-r7/anwar-android-bins

Rebuilt Android bins, remove store_loot calls
Merge pull request #3576 from dmaloney-r7/feature/MSP-9641/cred-rpc-calls

Feature/msp 9641/cred roc calls

MSP-9641 #land
Extract option require pattern to helper Module

MSP-10905

`Metasplot::Framework::Require.optionally` can be used to optionally
require a library and then issue a warning if the require fails or run a
block when it succeeds.
Optionally require 'active_record/railtie` in Rakefile

MSP-10905

Require in Rakefile so that db tasks are defined.  Make it optionally so
that `rake` doesn't error out when metasploit-framework installed with
`bundle install --without db`.
Use [] for References
Land #3582, @FireFart's rubocop cleanup for wp_property_upload_exec
Use [] for References
Ignore PercentLiteralDelimiters and WordArray

Per a discussion in IRC, these rules in particular don't
appear to be valuable for Metasploit at this stage.
Land #3584, @FireFart's update for wp_asset_manager_upload_exec
Also remove the offenses from the todo
Use [] for references
Land #3581, @FireFart's update for W3 Total Cache Hash extract module
Require 'active_record/railtie' for specs

MSP-10905
Fix spec failure due to workspace mismatch

Also fixes intermittent failure from FactoryGirl picking a heinous
Origin type.
Add #present? checks
Merge pull request #3583 from jlee-r7/feature/MSP-9932/creds-add-subcommands

Add `creds` subcommands

MSP-9932 #land