CSPACE-6302: Make sure a term has a generated shortid if none is specified, before checking if a term with the shortid already exists.
Merge pull request #129 from ray-lee/CSPACE-6302

CSPACE-6302: Making a tweak to the fix.
CSPACE-6371: Don't re-add soft deleted terms when initializing vocabularies.
Merge pull request #130 from ray-lee/CSPACE-6371

CSPACE-6371: Don't re-add soft deleted terms when initializing vocabularies.