Merge branch 'upstream-master' into staging/electro-release
Removing ruby-version and -gemset from gitignore

These should not have been removed.
Restoring ruby and gemset files
Merge branch 'staging/electro-release' of github.com:shuckins-r7/metasploit-framework into staging/electro-release
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Allow RAILS_ENV to override default environment of 'production'

MSP-10964
Only error out if Rails.env differs from options.environment

MSP-10964
Only require config/application.rb when Rails.application not set

MSP-10964

Allows other Rails::Applications to use the commands.
.to_credential now assigns a parent

Metasploit::Credential::Core#to_credential will set the parent to the original core objext
Metasploit::Framework::Credential#to_credential also sets the parent to itself.
Refactor sso to use Credential::Creation
Bump version to 4.10.0
Update framework version spec and Gemfile
Merge pull request #3596 from darkbushido/bug/MSP-10937/adding-parent-to-cores-to-credential

.to_credential now assigns a parent
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Merge branch 'pr/3593' into staging/electro-release
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Remove Msf::Framework::VersionCore

MSP-10998

It can't handle 4.10.0 because it tries to compact the multiple part
version into one float using (1 / 10.0).