Reapply "Merge pull request #1800 from quintel/households-stock-heat-migration"- #1803