I propose another idea of how to use lithium-ion batteries type 18650 in the lanterns. Your Review presented Flashlight Police BL-8400. Initially, its design does not allow to install the battery and the LED is powered by 3 AAA batteries. And this is the main problem - because the battery capacity is small, and they are quickly discharged. My upgrade allows you to install a large capacity battery (up to 3 hours and *) and thereby increase the continuous glow up to 10 hours.
The main problem that I encountered - this size flashlight, which simply does not fit the battery (for length). The only reasonable way, without major changes to the body, I chose shortening key holder. To this end, the holder itself with a button pull out of the housing. Next, carefully cut it on the line, which can be seen on the video. After installation in the building, we had extra space of 5-6 mm which is not enough.
And yet, in order to not hanging lantern and clearly fell on the positive contact, I made the coupling of plain paper.
It's all! Good luck to you design!