prevent conflict with another branch
Revert "prevent conflict with another branch"

This reverts commit fbb885f3a72d1609390d8901159f2e739c361150.
Prevent conflict with another branch
Merge branch 'service_payloads' of github.com:agix/metasploit-framework into service_payloads
Revert "with exe-only technique (use in to_win32pe_service) the default template template_x86_windows_old.exe crash."
to prevent conflict with another branch
This reverts commit bdd751e6fb54af2aae926eb2fe87fc33f816ce4d.