Fix ubuntu service name aliasing for heat

Change-Id: I480ca87267d6822aeb0614709f75c4bc9dc9efac
Closes-bug: #1338940
Merge "Fix ubuntu service name aliasing for heat"