Use -uniqueIdentifier in place of -treeUUID whenever possible

-uniqueIdentifier is saved between restarts, so it is the preferred
identifier for clients and channels