Syncing with vip

Noticed a small edge case bug in code that came down from VIP, fixed that and added tests.
This isn't a transient, so it doesn't follow the same rules. Hypothetically, there is no limit, but to keep it <=64 characters, for a 10-digit term ID that leaves 39 characters for a taxonomy