11636 heating states cleanup

Merged Christian Hitz requested to merge chhitz/dss-mainline:11636-heating-states-cleanup into master Nov 24, 2015