DS-1917 JSPUI validity fixes (several non-controversial fixes)

https://jira.duraspace.org/browse/DS-1917