Remove dependence on heat.common

Change-Id: I6b13b184edbc51a48633c82ce2db9814c9f7e2ce
2 files changed