Fix [H302] errors in heat/engine

Change-Id: Ib3e1a6f9d5e82e9fb29b000157b57dbc3883b42e
Merge "Fix [H302] errors in heat/engine"