Merge pull request #2051 from adudney/6.1.x

Fixed RF conversion bugs in the Stirling Engine
remove redundant code from #2051
remove useless TileEngineLegacy class