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