Refreshed service payloads

Here is the refreshed pull request for service payload related to https://github.com/rapid7/metasploit-framework/pull/1850/