Fix non-stacking renamed items. Fixes BUKKIT-4809

In the recent Minecraft update the fix in e20e50f,
which fixed the inconsistencies in saved/non-saved nbt data, was
made obsolete, by Minecraft adding the name "tag" to data.

We fix this by following suit in our own code, and ensuring all
instances of "tag" are set.