Fixed DTD errors caused by previous cherry picks.
Fixed DTD errors caused by previous cherry picks.

alkacon/opencms-core,gallardo/opencms-core,gallardo/opencms-core,gallardo/opencms-core,alkacon/opencms-core,alkacon/opencms-core,gallardo/opencms-core,alkacon/opencms-core