Solve conflicts

This pull requests tries to solve conflicts and do minor clean up in https://github.com/rapid7/metasploit-framework/pull/2904

@Meatballs1 do you mind to review and land if it's not breaking nothing? So we can go ahead with the pull request! Also, do you mind to provide a valid reference :? thanks!