Update against upstream

Hi @bmerinofe, this pull request tries to update https://github.com/rapid7/metasploit-framework/pull/2763 by getting the upstream changes so the Windows::Error namespace will be there! On my side after it, it will be ready to go atm, since getenv is under work at this moment on https://github.com/rapid7/metasploit-framework/pull/2782