Bug 1316: Fixed loop in global RPC forwarding.

Change-Id: Ic133471d4883e367230901c8596ccd46f2e9dc08
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
Merge "Bug 1316: Fixed loop in global RPC forwarding."