Fixes FIXME for Heat Installation

Change-Id: Ic14d0d3e5d507a50b4fb130e92cfab7dfb7b66f3
backport: havana
Merge "Fixes FIXME for Heat Installation"