Change-Id: I26e500b878d7322015f73eda151c2ba3b63b86d2
enables unit testing and heat dependency Change-Id: I51908e334b7ef3f0a2c200a1dae85de81e418a23