Fixes FIXME for Heat Installation

Change-Id: Ic14d0d3e5d507a50b4fb130e92cfab7dfb7b66f3
backport: havana
(cherry picked from commit 4452bd6d96b937b36e9db44fa744ef3be9dbd9af)
Merge "Fixes FIXME for Heat Installation" into stable/havana