Fix [H302] errors in heat/common

Change-Id: Id72426a6f921002630ad74ed00166885fb2ddf37
Merge "Fix [H302] errors in heat/common"