Revert "Revert heat : Store clients in context"

This revert has landed in upstream heat.

Change-Id: I1181c55fc9013f942ba9464239954d8e9ad6996d
Merge "Revert "Revert heat : Store clients in context""