Add some blocking so that we don't generate identical UUIDs for API objects.
Merge pull request #2120 from brendandburns/uuid

Add some blocking so that we don't generate identical UUIDs for API objects.