Only reserve ids in reltype store, no other token store

since they just weren't built for it.
Merge branch '1.9-maint' into 2.0-maint
Merge branch '2.0-maint' into 2.1-maint