Bug 957678 - Fix activityCaller/Callee ref in the chain +shepherd