DS-1917 JSPUI validity fixes (several non-controversial fixes)
Merge pull request #477 from helix84/DS-1917-JSPUI-validity-fixes

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