In creative,
picking up water with empty bottle does not consume the empty bottle, and gives you a water bottle if you don't already have one.
however,
picking up honey from an empty bottle consumes the bottle, adding a honey bottle to your inventory.
This is already tracked in MC-175492 🙂