Un-refactor GetOrCreateFooByGuid functions
Un-refactor GetOrCreateFooByGuid functions

Now that we need two different types of factories, one with an owner and
one without, the generic GetOrCreateCmObjectByGuid function was becoming
more complex than it's actually worth. Removing it and turning the four
"helper" functions into real factory functions has actually removed a
total of six lines of code -- a good clue that we were getting too
clever for our own good here.

ermshiperete/LfMerge,sillsdev/LfMerge,sillsdev/LfMerge,ermshiperete/LfMerge,ermshiperete/LfMerge,sillsdev/LfMerge