Conflicts in Post::Windows - Service Principal Name

Hi @Meatballs1

This pull request tries to solve conflicts on https://github.com/rapid7/metasploit-framework/pull/2903 Do you mind to check which works and land if it's good to you? So we can go ahead wit https://github.com/rapid7/metasploit-framework/pull/2903, thanks!