Fill context on objects in lists

This fixes object lists to not contain orphaned objects after
making an RPC trip.

Fixes bug 1191113

Change-Id: Ia90321da2f480835e1c7213a52eb5731840dbd6a
Merge "Fill context on objects in lists"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp