CSPACE-6064: Updating various uispec and uischema data files that had merge conflicts, when merging the CSPACE-5678-D App layer branch into the (v4.0) master branch.
CSPACE-6064: Updating one more uischema data file that had a merge conflict, when merging the CSPACE-5678-D App layer branch into the (v4.0) master branch.