Revert heat : Store clients in context

Temp tripleo ci revert.

Change-Id: Ia24eccef78665ed5c72572e72d02c83db37399a3