Merge branch 'bug/9582-metasploit-imports-and-tasks'

Land #3299
Merge branch 'master' of github.com:shuckins-r7/metasploit-framework
Merge branch 'upstream-master'
Merge branch 'master' of github.com:rapid7/metasploit-framework
Remove rubocop and msftidy touchpoints

Rubocop replaces the default YAML library which makes development
testing difficult. It does not cause problems on Travis, but according
to reports, it does cause instability with many individual dev
environments.

While I would love to have a more solid source of this bug report, right
now this was an oral report from @shuckins-r7 (who I tend to believe a
lot).
Update Gemfile.lock as well for PR #3639
Include .rubocop.yml from PR #3649
Merge branch 'master' of github.com:rapid7/metasploit-framework
Merge branch 'remove-rubocop'