Updated heat spec file for icehouse

Added if statements around new specfile pieces for icehouse

Change-Id: I86dae2a9d0d9c1c7d9767ea43be04d117857fbc2
Merge "Updated heat spec file for icehouse"