Solve conflicts

Hi @Meatballs1,

This pull request tries to solve conflicts on https://github.com/rapid7/metasploit-framework/pull/2903, do you mind to review and land if it's ok, so we can go ahead with https://github.com/rapid7/metasploit-framework/pull/2903 ? thanks!

UPDATE: This pull request also tries to do small clean up, do you mind to check (sorry not tested still!) https://github.com/jvazquez-r7/metasploit-framework/commit/61563fb2afabfa1d725ff1bfd90fabc6e5815333

thanks!