LPS-45817 Fix JSP compilation problems in D&M and Wiki, re-adding removed properties

Pushed to upstream