Merge pull request #393 from apoloval/task/port-fw

Several changes to implement port forwarding in message gateway