Revert "Store clients in context"

This commit caused a regression in tripleo when trying to signal
waitconditions.
This reverts commit de8b071acf21fe054267619124ac1a0374496185.
Fixes-bug: #1344079

Change-Id: Ib87eb81b687497a6669da38cb43b4f525cafa754
Merge "Revert "Store clients in context""