Yes, I believe the bottle bolts are all M5 thread.
On a carbon frame the bottle cage boss is a rivnut, which is inserted into the hole in the frame then pulled like a pop rivet, so that the side bulges out and holds the rivnut in place. On my old bike, years of wetting with road salt and sticky carb solution from the bottle made the top rivnut oxidise and eventually pull out. This failure was hastened by the twisting when I unscrewed the bottle cage bolts, which although they were stainless had partially rusted in because of the aluminium oxide, which had expanded and filled the thread. Not having a new rivnut to hand I cleaned everything up and glued it back in with Araldite, which seems to be working fine. I got some lanoline from the labs at work and used this to protect the threads on all four bottle cage bolts; grease would do just as well.
I've now got some new rivnuts and have discovered that you can insert them using a spare quick-release and an old axle to pull with. Alternatively you can bodge it using an M5 bolt and nut.
Some rivnuts:
A rivnut being inserted with a bolt bodge, yesterday: