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!