Allow Endpoint to specify which proxy module to use
Merge pull request #1254 from markewallace/EndpointProxyModuleId

Allow Endpoint to specify which proxy module to use