diff --git a/core/src/main/resources/hudson/PluginManager/available.jelly b/core/src/main/resources/hudson/PluginManager/available.jelly
index dcfc05b5ceed56098e65ae9745e55a474073aabb..8a029af3504c2b4da226277a6b209dfe93185a46 100644
--- a/core/src/main/resources/hudson/PluginManager/available.jelly
+++ b/core/src/main/resources/hudson/PluginManager/available.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   List of available new plugins    
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <local:table page="available" list="${app.updateCenter.categorizedAvailables}" xmlns:local="/hudson/PluginManager" />
 </j:jelly>
diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel.jelly b/core/src/main/resources/hudson/PluginManager/sidepanel.jelly
index aa77d49ecdf85012876607433ef60e4ba1c00e56..b6c634dae2455627d9f6187b2f35415e6cc1d846 100644
--- a/core/src/main/resources/hudson/PluginManager/sidepanel.jelly
+++ b/core/src/main/resources/hudson/PluginManager/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:header />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar.jelly b/core/src/main/resources/hudson/PluginManager/tabBar.jelly
index 1a7e8eeb3a731b70e0848c9f96d929801beec224..c974dfbb268d1758e3fb2dacc69a44e5849b2310 100644
--- a/core/src/main/resources/hudson/PluginManager/tabBar.jelly
+++ b/core/src/main/resources/hudson/PluginManager/tabBar.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   List of available new plugins
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:tabBar>
     <l:tab name="${%Updates}" active="${page=='updates'}" href="." />
diff --git a/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly b/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
index 028fa38edf9205c931867f19b1e29782dd89cbf2..a47151e632f2251449595323c7e1b6aed01e4727 100644
--- a/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
+++ b/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <!--
     Publicize the TCP port number for JNLP slave agents so that they know where to conenct.
diff --git a/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly
index 02886eb08fa9ae87ae21a89ad06ba08ed93e1e42..452240fe0846a784119de7e38c0ad2a5eb444083 100644
--- a/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly
+++ b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName} Memory Usage">
     <!-- TODO: where in the tree structure should this really belong? -->
diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly
index 82608a7191a780839114a153210677d55c3b69b6..89d38c592e5033a930880788ac2fefa43913212b 100644
--- a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div class="warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
diff --git a/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly
index c23ff98a0b40aaada2569f0c10ea1f83e3741ad6..efb2a520d955cc6b040e7b2893bfd347aed24692 100644
--- a/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div class="warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
diff --git a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index.jelly b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index.jelly
index 79c64b5d37c40605976f6ba7c8a20fb21a75725e..54623045b4c308a3b1fff96569b96dc7d089d4e2 100644
--- a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index.jelly
+++ b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout permission="${app.ADMINISTER}" title="${%Install as Windows Service}">
     <st:include it="${app}" page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/logging/LogRecorder/delete.jelly b/core/src/main/resources/hudson/logging/LogRecorder/delete.jelly
index 0e0f74c9457e1decdd8829e85aa5757b0f8f6e22..896f9a30ba58bd75f09307adacfaa468fad5bbd9 100644
--- a/core/src/main/resources/hudson/logging/LogRecorder/delete.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorder/delete.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Displays the button to delete the build.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout>
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/logging/LogRecorder/sidepanel.jelly b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel.jelly
index 57211bdc8aae5da3e0729e8cad40a5fe2a8f45f2..2ea64f89abf718059ef8afe5abe624901c39c8a2 100644
--- a/core/src/main/resources/hudson/logging/LogRecorder/sidepanel.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for the log recorder
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:header />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/feeds.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/feeds.jelly
index 0b1de720a542189d8c59f09ac42c7a49a125bb6a..8c2d562f17d17d560bfbdcf5ff0d40b9b740217b 100644
--- a/core/src/main/resources/hudson/logging/LogRecorderManager/feeds.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorderManager/feeds.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- list of feed links -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div align="right" style="margin:1em">
     <img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/>
diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/new.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/new.jelly
index 5055877ec182214b1c3ba44855b06d4888dd8e4b..f67e19f3722569acc476dade849d9079b5d2948c 100644
--- a/core/src/main/resources/hudson/logging/LogRecorderManager/new.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorderManager/new.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Create a new LogRecorder
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout norefresh="true">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel.jelly
index 659a2705a999607782e249bd97cad906493dcaa2..f31a6c887dc0e648c124f10a85028d9c52b79d5a 100644
--- a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:header />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/markup/RawHtmlMarkupFormatter/config.jelly b/core/src/main/resources/hudson/markup/RawHtmlMarkupFormatter/config.jelly
index 3bc229ac77708057c9bdc7ae7acb1c56de127e12..724f54a7ad51c7af79c4cbdf399c9a225a728a4a 100644
--- a/core/src/main/resources/hudson/markup/RawHtmlMarkupFormatter/config.jelly
+++ b/core/src/main/resources/hudson/markup/RawHtmlMarkupFormatter/config.jelly
@@ -1,4 +1,5 @@
 <!-- no config -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:description>
     ${%blurb}
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly b/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly
index ad4a0098ae8530fecf9e061b4c82d9ddf011a09a..8b357557fff90a16869f5640f75582124a5a3c39 100644
--- a/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly
+++ b/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Displays the console output
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.fullDisplayName} ${%Changes}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly
index 65deaad37e069f016b1ce4dafaed3f6812bed5fc..a8a2ad2e3523c1d82d9e0ea3fde727cfd88b53e4 100644
--- a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for the build view.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:header />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/tasks.jelly b/core/src/main/resources/hudson/model/AbstractBuild/tasks.jelly
index ee93a499e6d618d12d30bbebf3fab6a7a2dd1186..8e2b044b6d39d1da87e5781209362b0a19503d76 100644
--- a/core/src/main/resources/hudson/model/AbstractBuild/tasks.jelly
+++ b/core/src/main/resources/hudson/model/AbstractBuild/tasks.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for the build view.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
       <l:task icon="images/24x24/up.gif" href="${it.upUrl}" title="${%Back to Project}" />
       <l:task icon="images/24x24/search.gif" href="${buildUrl.baseUrl}/" title="${%Status}" />
diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly
index 41eef86acb7f32b3572569d9c9f3ca94db9789bf..e4a33075e074b6bcdef16e6969e933e420fce0b2 100644
--- a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly
+++ b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used by editableDescription.jelly for loading the edit form.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:f="/lib/form" xmlns:l="/lib/layout">
   <j:if test="${it.class.name=='hudson.model.Hudson'}">
     <j:set var="it" value="${it.primaryView}"/>
diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly b/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly
index 2175180fa0db09de0d9d703ec14d6f34233cad04..02531915fae2dd537a3cd7b3cb90a393bc75eb18 100644
--- a/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly
+++ b/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   If JavaScript is off, this form is used to edit the description
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName}" norefresh="true">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/AbstractProject/BecauseOfUpstreamBuildInProgress/summary.jelly b/core/src/main/resources/hudson/model/AbstractProject/BecauseOfUpstreamBuildInProgress/summary.jelly
index 2fb40a6807f6d6588eefa7d7069762595e6b251e..677a7b09021b1fd9ddeea3e7f4feaf2b5ea63480 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/BecauseOfUpstreamBuildInProgress/summary.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/BecauseOfUpstreamBuildInProgress/summary.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:structuredMessageFormat key="description">
     <st:structuredMessageArgument>
diff --git a/core/src/main/resources/hudson/model/AbstractProject/_api.jelly b/core/src/main/resources/hudson/model/AbstractProject/_api.jelly
index d46b0d447d030481ab22a80b7c4cb40fb786d333..51dd0bbb1f6e1364efbabb145e647accfb7964f3 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/_api.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/_api.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:include page="/hudson/model/Job/_api.jelly" />
 
diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly
index 245910626ad84b950fc5b57d1d4ae4890414afff..48f619b2ba680b7c04512cbbfd3adccba18e3b0e 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for the project view.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:header title="${it.name}">
     <st:include page="rssHeader.jelly" />
diff --git a/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspace.jelly b/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspace.jelly
index 7433430f841367596de82baaef9584ed6a2af4ca..4e6e8403387ce02b7cd46508141acf8588360ece 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspace.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspace.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- ask the user if he's ready to wipe out the workspace -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout>
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked.jelly b/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked.jelly
index 0d647d88f843497555bd98c87ae127aee7f936f4..d7a23429a6d813463cbdbe346c0278673708dfa8 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- tell user that there's no workspace yet -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout>
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Actionable/actions.jelly b/core/src/main/resources/hudson/model/Actionable/actions.jelly
index 13caa2c462ce69aebf6bb9dcc1e1a901e5336d85..ddfae3c7c957f2d6de7e1bf875405f3a10eb97c1 100644
--- a/core/src/main/resources/hudson/model/Actionable/actions.jelly
+++ b/core/src/main/resources/hudson/model/Actionable/actions.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Action list
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <t:actions />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/AgentSlave/config.jelly b/core/src/main/resources/hudson/model/AgentSlave/config.jelly
index 7a4618757d433ad8877800eb541d172a080e27d3..91ee5b7b35f2e8c2ceef2094d572873248e6eac5 100644
--- a/core/src/main/resources/hudson/model/AgentSlave/config.jelly
+++ b/core/src/main/resources/hudson/model/AgentSlave/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<f:entry title="${%launch command}">
 	  <f:textbox name="slave.command" value="${slave.command}"/>
diff --git a/core/src/main/resources/hudson/model/AllView/newViewDetail.jelly b/core/src/main/resources/hudson/model/AllView/newViewDetail.jelly
index f45272aefafd5a807eca166069c44c7a8f909ca0..5493fb58b0ce1747321a5a24163c836edace1cb5 100644
--- a/core/src/main/resources/hudson/model/AllView/newViewDetail.jelly
+++ b/core/src/main/resources/hudson/model/AllView/newViewDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <div>
   ${%blurb}
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/BooleanParameterDefinition/config.jelly b/core/src/main/resources/hudson/model/BooleanParameterDefinition/config.jelly
index b77a47f28644c89f89b61a01b78bf937b1064aa0..cc4daf5fc202203b21e4de57a17c99a2e4e2d836 100755
--- a/core/src/main/resources/hudson/model/BooleanParameterDefinition/config.jelly
+++ b/core/src/main/resources/hudson/model/BooleanParameterDefinition/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/BooleanParameterDefinition/index.jelly b/core/src/main/resources/hudson/model/BooleanParameterDefinition/index.jelly
index 1930ded78e252acc84f52b7cfa536cf034b3813a..1d939cb60f9229c5da299f72feb7242daa27c47f 100755
--- a/core/src/main/resources/hudson/model/BooleanParameterDefinition/index.jelly
+++ b/core/src/main/resources/hudson/model/BooleanParameterDefinition/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly b/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly
index a34d37d3c26f2b657502751366acf77c1c9929f8..4dd9f679d747a3435e4dd00bbb1233fc59846852 100755
--- a/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly
+++ b/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config.jelly b/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config.jelly
index 7d4cba821edc3ee32a0bc201fd689667c81512a0..da360341ceb0ca7b9cd5aed3bc72e897b7bc5b12 100755
--- a/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config.jelly
+++ b/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/Computer/_api.jelly b/core/src/main/resources/hudson/model/Computer/_api.jelly
index 2d5207cec7e3ee919f4dd7b8f820a885f9b4a1ff..5a15d7966bd71e62fccfc8249336c63a20843ae8 100644
--- a/core/src/main/resources/hudson/model/Computer/_api.jelly
+++ b/core/src/main/resources/hudson/model/Computer/_api.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <h2>Load Statistics</h2>
   <p>
diff --git a/core/src/main/resources/hudson/model/Computer/_script.jelly b/core/src/main/resources/hudson/model/Computer/_script.jelly
index 790cd0b044770179f2748d0c463f607947fc662b..ca26f7207955dbdf443952a518fc83a173932818 100644
--- a/core/src/main/resources/hudson/model/Computer/_script.jelly
+++ b/core/src/main/resources/hudson/model/Computer/_script.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Called from doScript() to display the execution result and the form.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <t:scriptConsole>
     <pre>println System.getenv("PATH")</pre>
diff --git a/core/src/main/resources/hudson/model/Computer/ajaxExecutors.jelly b/core/src/main/resources/hudson/model/Computer/ajaxExecutors.jelly
index 60add04c8642e7789767f830c6ce0894b4593d19..54c676d1aa78a1804cc0008ccdffc255d5c8758b 100644
--- a/core/src/main/resources/hudson/model/Computer/ajaxExecutors.jelly
+++ b/core/src/main/resources/hudson/model/Computer/ajaxExecutors.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used to asynchronously update executor queue
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:ajax>
     <t:executors computers="${h.singletonList(it)}" />
diff --git a/core/src/main/resources/hudson/model/Computer/configure.jelly b/core/src/main/resources/hudson/model/Computer/configure.jelly
index c027d997b19450289b3bc013a7982daae1a13068..f4894e026ec42a33e527cce0076ada760438ca95 100644
--- a/core/src/main/resources/hudson/model/Computer/configure.jelly
+++ b/core/src/main/resources/hudson/model/Computer/configure.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout norefresh="true" permission="${it.CONFIGURE}" title="${%title(it.displayName)}">
diff --git a/core/src/main/resources/hudson/model/Computer/custom-jnlp.jelly b/core/src/main/resources/hudson/model/Computer/custom-jnlp.jelly
index e01e999346f7f7634d9eed379302a68cdecc459c..df19f8cd2c62e0df2becfa0646855b350e3279b2 100644
--- a/core/src/main/resources/hudson/model/Computer/custom-jnlp.jelly
+++ b/core/src/main/resources/hudson/model/Computer/custom-jnlp.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Computer/delete.jelly b/core/src/main/resources/hudson/model/Computer/delete.jelly
index a4a18a744450a03b96dfcc807d927993ee33cb5f..2ae6fea1763d90a8ee7270fcf5e3b4dcb27fa1f3 100644
--- a/core/src/main/resources/hudson/model/Computer/delete.jelly
+++ b/core/src/main/resources/hudson/model/Computer/delete.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout>
 		<st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Computer/load-statistics.jelly b/core/src/main/resources/hudson/model/Computer/load-statistics.jelly
index 118774daeb85477a2f002de5b972e9512ed5a2fe..7a4a00865ba048ec615c7c9cf2e1dcdf0518b8e4 100644
--- a/core/src/main/resources/hudson/model/Computer/load-statistics.jelly
+++ b/core/src/main/resources/hudson/model/Computer/load-statistics.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName} Load Statistics">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Computer/nodepropertysummaries.jelly b/core/src/main/resources/hudson/model/Computer/nodepropertysummaries.jelly
index efbdcc8ff96cb376fdd95ddaa2ca10af1ed2848a..78df2245dfea387e7b0e775444be823fb1d16fbf 100644
--- a/core/src/main/resources/hudson/model/Computer/nodepropertysummaries.jelly
+++ b/core/src/main/resources/hudson/model/Computer/nodepropertysummaries.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- display permalinks of the page -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
 	<!-- give properties a chance to contribute summary item -->
 	<j:forEach var="p" items="${app.globalNodeProperties}">
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel.jelly b/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
index 6da741a7c6e2a0c9f306a670e460b19f822901ec..3e03bf16c9792ce6159f4ce1fdcd83a5ea786382 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for a slave.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:header />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/model/ComputerSet/_new.jelly b/core/src/main/resources/hudson/model/ComputerSet/_new.jelly
index 2de2519bfef271c5b5f341e833d970d193fd0d2e..7859b32bfcdb57cfdba5a500ffb239a16335508b 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/_new.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/_new.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   2nd page in the "new slave" page for displaying the entire configuration entries for the selected job type.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout norefresh="true" permission="${app.ADMINISTER}">
diff --git a/core/src/main/resources/hudson/model/ComputerSet/configure.jelly b/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
index ac60dddb2da39c98c67671765928c3076f0d5c36..5a88fd686ea32ebb99ae20a21f95e138b0550f61 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Manage monitoring
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${%Node Monitoring Configuration}" norefresh="true">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/ComputerSet/new.jelly b/core/src/main/resources/hudson/model/ComputerSet/new.jelly
index a90c38af8f6ba7654447983634d22989e9729bc6..6e489bbae72dcc9f97acdc80cd2b148d34d924b5 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/new.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/new.jelly
@@ -29,6 +29,7 @@ THE SOFTWARE.
 
     new.jelly -> ComputerSet.doCreateItem -> _new2.jelly -> ComputerSet.doDoCreateItem
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:layout norefresh="true" permission="${app.ADMINISTER}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly b/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
index 2c3b9f477a7e38dc0c367602c5f7457097887b35..582833635bb4a9c86339a83f162ba5f6884ecc53 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:header />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/model/Descriptor/newInstanceDetail.jelly b/core/src/main/resources/hudson/model/Descriptor/newInstanceDetail.jelly
index da1756c4964eb129c539c38b89c45dec6dcdbd6b..4e5890320a06fbc98cbd4cd7044effa9066a84cb 100644
--- a/core/src/main/resources/hudson/model/Descriptor/newInstanceDetail.jelly
+++ b/core/src/main/resources/hudson/model/Descriptor/newInstanceDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <!--
     Used to render the description under a radio button in the "new job/computer/etc" page.
diff --git a/core/src/main/resources/hudson/model/ExternalJob/sidepanel.jelly b/core/src/main/resources/hudson/model/ExternalJob/sidepanel.jelly
index aeb62bcba22b49c0af577a03aad795896e58c637..d61b7e8ad4179632d073252f1adc14e46f87f50b 100644
--- a/core/src/main/resources/hudson/model/ExternalJob/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/ExternalJob/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for the build view.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
 	<l:header title="${it.name}">
 	  <st:include page="rssHeader.jelly" />
diff --git a/core/src/main/resources/hudson/model/ExternalRun/index.jelly b/core/src/main/resources/hudson/model/ExternalRun/index.jelly
index b0fc03f4f8e2ff4807ae59b424c6ef3db29166a4..997dcbe280931d0997f05818beb3ab2d52688ad5 100644
--- a/core/src/main/resources/hudson/model/ExternalRun/index.jelly
+++ b/core/src/main/resources/hudson/model/ExternalRun/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
 	<st:include page="console.jelly"/>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly b/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly
index 206f770981d2d011f1ff045732763ad8976ca8fb..6ea7b4bcdc91cba49aae7c7580b0a11755d70162 100644
--- a/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for the build view.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:header title="${it.fullDisplayName}" />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/model/FileParameterDefinition/config.jelly b/core/src/main/resources/hudson/model/FileParameterDefinition/config.jelly
index 2b4f36c88a80b83b93b07349e228e636e3c39bc7..5ce7b2b6d6379fc26b29a9b269f167ed81f10d95 100644
--- a/core/src/main/resources/hudson/model/FileParameterDefinition/config.jelly
+++ b/core/src/main/resources/hudson/model/FileParameterDefinition/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/FileParameterDefinition/index.jelly b/core/src/main/resources/hudson/model/FileParameterDefinition/index.jelly
index f828ca79ab82adf54815676a2e25b12461b97548..543b298f4de228591d0bc8bddaedd115302ba6d2 100644
--- a/core/src/main/resources/hudson/model/FileParameterDefinition/index.jelly
+++ b/core/src/main/resources/hudson/model/FileParameterDefinition/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/configure-advanced.jelly b/core/src/main/resources/hudson/model/FreeStyleProject/configure-advanced.jelly
index f8b06aadc274abff1b772add0bd3af7cecceeca5..fabc6c1fb5f95ebcd429bb71a7902cd8b9e13da2 100644
--- a/core/src/main/resources/hudson/model/FreeStyleProject/configure-advanced.jelly
+++ b/core/src/main/resources/hudson/model/FreeStyleProject/configure-advanced.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Additional entries in the advanced section.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
   <p:config-customWorkspace />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.jelly b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.jelly
index 489155118e03e506d52edabdbff76dfe7bd10867..583f693ef4b8404f29909eb5f8c8062382d73114 100644
--- a/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.jelly
+++ b/core/src/main/resources/hudson/model/FreeStyleProject/newJobDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <div>
   ${%body}
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Hudson/_restart.jelly b/core/src/main/resources/hudson/model/Hudson/_restart.jelly
index ad845a6734b5ba9abcbf38056039bc5dedd40412..7816f469c52d73847f4b9001be5bdfd70eb77708 100644
--- a/core/src/main/resources/hudson/model/Hudson/_restart.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/_restart.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- Delete view -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
 	<l:layout title="Restart Jenkins">
 		<st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Hudson/_safeRestart.jelly b/core/src/main/resources/hudson/model/Hudson/_safeRestart.jelly
index aae8c9fc1a3cc864c69381f8aed2665c7e01fad1..3a76e6af82abdabe53343f0d2e28ee7fbf161641 100644
--- a/core/src/main/resources/hudson/model/Hudson/_safeRestart.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/_safeRestart.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- Delete view -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
 	<l:layout title="Safely Restart Jenkins">
 		<st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Hudson/_script.jelly b/core/src/main/resources/hudson/model/Hudson/_script.jelly
index 525b98b977e417238524c2c5ce9a485c47e00159..b8f756f81b27ad4f246388ac55237a9a353d78be 100644
--- a/core/src/main/resources/hudson/model/Hudson/_script.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/_script.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Called from doScript() to display the execution result and the form.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <t:scriptConsole>
     <pre>println(hudson.model.Hudson.instance.pluginManager.plugins)</pre>
diff --git a/core/src/main/resources/hudson/model/Hudson/accessDenied.jelly b/core/src/main/resources/hudson/model/Hudson/accessDenied.jelly
index 1a67a5d99094ff2a19ec5b90e636509e9ed23bc9..e61874b1224b2dec496af86ea62de94e745cd5ec 100644
--- a/core/src/main/resources/hudson/model/Hudson/accessDenied.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/accessDenied.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout norefresh="true">
     <!-- don't include sidepanel.jelly, which could reveal information -->
diff --git a/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly b/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly
index 9420cbf60a908e648d020d8116ae76db0a445148..009b333d39686d19166f67620ecf56f4a254c510 100644
--- a/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
   This used to be where people configure executors before 1.271, so just in case people have bookmarked this page,
   explain what happened.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="This page has moved">
   <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Hudson/downgrade.jelly b/core/src/main/resources/hudson/model/Hudson/downgrade.jelly
index fccc93198677811e9970a875aa1242ab7a279966..fe6515eeea63cc62cc4a6b0c26f885f1eff61330 100644
--- a/core/src/main/resources/hudson/model/Hudson/downgrade.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/downgrade.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div class="downgrade">
       <j:if test="${app.updateCenter.downgradable}">
diff --git a/core/src/main/resources/hudson/model/Hudson/legend.jelly b/core/src/main/resources/hudson/model/Hudson/legend.jelly
index 96fb7b367fbb7a76054fd01aa84c61d3b804bd5d..16bcdd21d5506251c75f7cb18def7cfa767fe855 100644
--- a/core/src/main/resources/hudson/model/Hudson/legend.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/legend.jelly
@@ -24,6 +24,7 @@ THE SOFTWARE.
 -->
 
 <!-- show the icon legend -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:layout>
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Hudson/load-statistics.jelly b/core/src/main/resources/hudson/model/Hudson/load-statistics.jelly
index 6888abdc2f7cb78356bf58544f42e8c99f983a9f..b5f8b441d8ece6b5485d490263673507788eae10 100644
--- a/core/src/main/resources/hudson/model/Hudson/load-statistics.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/load-statistics.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName} ${%Load Statistics}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError.jelly b/core/src/main/resources/hudson/model/Hudson/loginError.jelly
index 9ea9cc33b45b6733cddd01af71fd5c23596d4bf2..6f7c2bfb2261dfa52c22e32b4e3d243f1b75dfef 100644
--- a/core/src/main/resources/hudson/model/Hudson/loginError.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/loginError.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- report a login error -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:choose>
     <j:new var="h" className="hudson.Functions" />
diff --git a/core/src/main/resources/hudson/model/Hudson/sidepanel.jelly b/core/src/main/resources/hudson/model/Hudson/sidepanel.jelly
index deee8f063a29826a606cbd138f26ae9e78fac2e0..9ddff73647d6d82c63f4dc5125c24c881519a24a 100644
--- a/core/src/main/resources/hudson/model/Hudson/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/sidepanel.jelly
@@ -22,4 +22,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <st:include it="${it.primaryView}" page="sidepanel.jelly" xmlns:st="jelly:stapler" />
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo.jelly b/core/src/main/resources/hudson/model/Hudson/systemInfo.jelly
index 04459811069240bab369ed534c9a078f13319cf7..c18e8770352658688440a6f3d26d75998e318c41 100644
--- a/core/src/main/resources/hudson/model/Hudson/systemInfo.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/systemInfo.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Various system information for diagnostics
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout permission="${app.ADMINISTER}" title="${%System Information}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/JDK/config.jelly b/core/src/main/resources/hudson/model/JDK/config.jelly
index 8d7c5cadf6d30ba2c45a6cf6a687b0ba3d2e0641..a1ce03075ed3143b2482d5bedb0fba7d6fb25171 100644
--- a/core/src/main/resources/hudson/model/JDK/config.jelly
+++ b/core/src/main/resources/hudson/model/JDK/config.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Name}" field="name">
     <f:textbox />
diff --git a/core/src/main/resources/hudson/model/Job/_api.jelly b/core/src/main/resources/hudson/model/Job/_api.jelly
index d5761f70c3af60d39d081405f0592f20ebfe145e..5d019fbb395fc8daefa772a75a07b7c596c4fee9 100644
--- a/core/src/main/resources/hudson/model/Job/_api.jelly
+++ b/core/src/main/resources/hudson/model/Job/_api.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <h2>Fetch/Update config.xml</h2>
   <p>
diff --git a/core/src/main/resources/hudson/model/Job/configure-entries.jelly b/core/src/main/resources/hudson/model/Job/configure-entries.jelly
index 6b48007369d9cf407cd0e4a51fb939769240235c..426e0d704012e49d05ea127be7f8a84fa1a59de2 100644
--- a/core/src/main/resources/hudson/model/Job/configure-entries.jelly
+++ b/core/src/main/resources/hudson/model/Job/configure-entries.jelly
@@ -25,4 +25,5 @@ THE SOFTWARE.
 <!--
   derived class should override this JSP to put additional entries to the config page.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" />
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Job/configure.jelly b/core/src/main/resources/hudson/model/Job/configure.jelly
index 67d67d77a3fba3e6cb8754e3dc12640d718b1a19..fce9346ccf79e374a830b24410e8f09d5ed93245 100644
--- a/core/src/main/resources/hudson/model/Job/configure.jelly
+++ b/core/src/main/resources/hudson/model/Job/configure.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page. derived class specific entries should go to configure-entries.jsp
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName} Config" norefresh="true" permission="${it.EXTENDED_READ}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Job/jobpropertysummaries.jelly b/core/src/main/resources/hudson/model/Job/jobpropertysummaries.jelly
index 036fcb390419ccaec674dc05ab4b5ef3ab6c19dc..98ada710902a55b336b62ca8df86581d4db8ea93 100644
--- a/core/src/main/resources/hudson/model/Job/jobpropertysummaries.jelly
+++ b/core/src/main/resources/hudson/model/Job/jobpropertysummaries.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- display permalinks of the page -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
 	<!-- give properties a chance to contribute summary item -->
 	<j:forEach var="p" items="${it.properties.values()}">
diff --git a/core/src/main/resources/hudson/model/Job/main.jelly b/core/src/main/resources/hudson/model/Job/main.jelly
index 1a97b97e333c1766cc371d99eb57a9289ad57191..43f95ecf9eef428f676a5d897b0607ba24e8f923 100644
--- a/core/src/main/resources/hudson/model/Job/main.jelly
+++ b/core/src/main/resources/hudson/model/Job/main.jelly
@@ -23,4 +23,5 @@ THE SOFTWARE.
 -->
 
 <!-- place holder for the derived types to add more contents -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" />
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Job/newInstanceDetail.jelly b/core/src/main/resources/hudson/model/Job/newInstanceDetail.jelly
index 4be3c3454ef46ec42f369bb8add6cf476e420fce..d21d52fcd0c9a100bc9c24acc7b9e3fd00572399 100644
--- a/core/src/main/resources/hudson/model/Job/newInstanceDetail.jelly
+++ b/core/src/main/resources/hudson/model/Job/newInstanceDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <!--
     For historical reasons, jobs used "newJobDetail.jelly".
diff --git a/core/src/main/resources/hudson/model/Job/permalinks.jelly b/core/src/main/resources/hudson/model/Job/permalinks.jelly
index d4ec68916795922bfa08fafd7ab64341871cd7e2..5517dcb415ba7a303742f4695bfbf8dabf338d2e 100644
--- a/core/src/main/resources/hudson/model/Job/permalinks.jelly
+++ b/core/src/main/resources/hudson/model/Job/permalinks.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- display permalinks of the page -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <h2>${%Permalinks}</h2>
   <ul>
diff --git a/core/src/main/resources/hudson/model/Job/rssHeader.jelly b/core/src/main/resources/hudson/model/Job/rssHeader.jelly
index 6f9dc994838a8a12533267311d8a1f966f926f7a..18e20db56f1d15eeb707f12a5c52ef2f934d50ba 100644
--- a/core/src/main/resources/hudson/model/Job/rssHeader.jelly
+++ b/core/src/main/resources/hudson/model/Job/rssHeader.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
   <link rel="alternate" title="Jenkins:${it.name} (all builds)" href="rssAll" type="application/rss+xml" />
   <link rel="alternate" title="Jenkins:${it.name} (all builds) (RSS 2.0)" href="rssAll?flavor=rss20" type="application/rss+xml" />
diff --git a/core/src/main/resources/hudson/model/Label/load-statistics.jelly b/core/src/main/resources/hudson/model/Label/load-statistics.jelly
index 118774daeb85477a2f002de5b972e9512ed5a2fe..7a4a00865ba048ec615c7c9cf2e1dcdf0518b8e4 100644
--- a/core/src/main/resources/hudson/model/Label/load-statistics.jelly
+++ b/core/src/main/resources/hudson/model/Label/load-statistics.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName} Load Statistics">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Label/sidepanel.jelly b/core/src/main/resources/hudson/model/Label/sidepanel.jelly
index 5574ee6ae60476df7f72d9e8cdb6d982479880b3..0e97e26a3369e49a4e0092bd7ffa83b2618a6f1f 100644
--- a/core/src/main/resources/hudson/model/Label/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/Label/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for a label.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:header title="Label ${it.displayName}" />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/model/ListView/newViewDetail.jelly b/core/src/main/resources/hudson/model/ListView/newViewDetail.jelly
index fd06b56a12e093caac8ff81e209ae3ed74f0d0b6..40ceb9f19de67e9ea9f6d4dcb427735560e3499d 100644
--- a/core/src/main/resources/hudson/model/ListView/newViewDetail.jelly
+++ b/core/src/main/resources/hudson/model/ListView/newViewDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <div>
   ${%blurb} 
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/MyView/newViewDetail.jelly b/core/src/main/resources/hudson/model/MyView/newViewDetail.jelly
index fd06b56a12e093caac8ff81e209ae3ed74f0d0b6..40ceb9f19de67e9ea9f6d4dcb427735560e3499d 100644
--- a/core/src/main/resources/hudson/model/MyView/newViewDetail.jelly
+++ b/core/src/main/resources/hudson/model/MyView/newViewDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <div>
   ${%blurb} 
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/MyView/noJob.jelly b/core/src/main/resources/hudson/model/MyView/noJob.jelly
index a7b538dc482f93c412aac40563cce4db148bcbe6..c80ce5afebb50970682d19cbaaac6e09d87adfe5 100644
--- a/core/src/main/resources/hudson/model/MyView/noJob.jelly
+++ b/core/src/main/resources/hudson/model/MyView/noJob.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <div>
   ${%blurb}
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/MyViewsProperty/config.jelly b/core/src/main/resources/hudson/model/MyViewsProperty/config.jelly
index ca35c5c4aa2ac71b7f862a84e565af799b651f2c..3d078144bb07a1a2aeeae5b7fc02e528857bbb9b 100644
--- a/core/src/main/resources/hudson/model/MyViewsProperty/config.jelly
+++ b/core/src/main/resources/hudson/model/MyViewsProperty/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Default View}"
     description="${%description}">
diff --git a/core/src/main/resources/hudson/model/ParameterDefinition/config.jelly b/core/src/main/resources/hudson/model/ParameterDefinition/config.jelly
index 951fee6d57626def3e6a81a84ca3e95b3d1da69d..9a04ea5e5b95d25e420b6d546afbd9d3a6ce4738 100644
--- a/core/src/main/resources/hudson/model/ParameterDefinition/config.jelly
+++ b/core/src/main/resources/hudson/model/ParameterDefinition/config.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   This Jelly view shows UI for configuring parameter definitions as a part of the job configuration.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config.jelly b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config.jelly
index 196a004103af2b8f31f65c28cca842834f7d8aed..b2a1f6ba1016621432632f0264d1f5e55f4a5325 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config.jelly
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/PasswordParameterDefinition/config.jelly b/core/src/main/resources/hudson/model/PasswordParameterDefinition/config.jelly
index 175f87661c8b9931344aa9332f7d298329ca583e..2ccb38245e52b3c6d1eccede0a9437851d361c47 100644
--- a/core/src/main/resources/hudson/model/PasswordParameterDefinition/config.jelly
+++ b/core/src/main/resources/hudson/model/PasswordParameterDefinition/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/PasswordParameterDefinition/index.jelly b/core/src/main/resources/hudson/model/PasswordParameterDefinition/index.jelly
index acaec9ee062128b10e7c47d344a2cbfab797cab9..84281a551a6060bb563cbe154a8916864c365019 100644
--- a/core/src/main/resources/hudson/model/PasswordParameterDefinition/index.jelly
+++ b/core/src/main/resources/hudson/model/PasswordParameterDefinition/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/PasswordParameterValue/value.jelly b/core/src/main/resources/hudson/model/PasswordParameterValue/value.jelly
index a064c798d68aa076e5685306da0d2a55515906eb..d1a142f2dbf886c3b79007748c2c6346231f57e1 100644
--- a/core/src/main/resources/hudson/model/PasswordParameterValue/value.jelly
+++ b/core/src/main/resources/hudson/model/PasswordParameterValue/value.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/Project/configure-entries.jelly b/core/src/main/resources/hudson/model/Project/configure-entries.jelly
index dd6051707ad2d36e097ef348bce9f4999f52b18b..e296f2c51d60de32227eb9d7637c0de1989bc190 100644
--- a/core/src/main/resources/hudson/model/Project/configure-entries.jelly
+++ b/core/src/main/resources/hudson/model/Project/configure-entries.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
   <st:include page="configure-common.jelly" />
 
diff --git a/core/src/main/resources/hudson/model/ProxyView/main.jelly b/core/src/main/resources/hudson/model/ProxyView/main.jelly
index 6e040649bfbaa343160d928b03432217af5833ed..945955932f868abb53def95ef8b6098d2051d78b 100644
--- a/core/src/main/resources/hudson/model/ProxyView/main.jelly
+++ b/core/src/main/resources/hudson/model/ProxyView/main.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
     <st:include it="${it.proxiedView}" page="main.jelly"/>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/ProxyView/newViewDetail.jelly b/core/src/main/resources/hudson/model/ProxyView/newViewDetail.jelly
index 4553c537feb5f6e8381adebfbcfdd5c55a5d3661..de5a9f0c8bfcfa18b660d391cc1b92e68eaba7a4 100644
--- a/core/src/main/resources/hudson/model/ProxyView/newViewDetail.jelly
+++ b/core/src/main/resources/hudson/model/ProxyView/newViewDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <div>
   ${%Shows the content of a global view.}
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly
index 8bc00359c60bc7b9b15d59449ce530cd13dbb9d8..4c1d8721096f17f00e27d78f328eb6169111cae3 100644
--- a/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly
+++ b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <img width="16" height="16"
   title="${%Keep this build forever}" alt="[saved]"
   src="${imagesURL}/16x16/lock.gif"/>
diff --git a/core/src/main/resources/hudson/model/Run/_api.jelly b/core/src/main/resources/hudson/model/Run/_api.jelly
index dcfffb68a35becf25819d7e77fbd55940c636141..bd8214091166c0767bde4d4df997166680d59a2e 100644
--- a/core/src/main/resources/hudson/model/Run/_api.jelly
+++ b/core/src/main/resources/hudson/model/Run/_api.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <h2>Other Useful URLs</h2>
   <dl>
diff --git a/core/src/main/resources/hudson/model/Run/configure.jelly b/core/src/main/resources/hudson/model/Run/configure.jelly
index 1fc0292ace29e07df711a5b2e77bff0cf0572e77..39da7a264435326b8122885cb62f5132a5a2fd62 100644
--- a/core/src/main/resources/hudson/model/Run/configure.jelly
+++ b/core/src/main/resources/hudson/model/Run/configure.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName} Config" norefresh="true">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/Run/consoleFull.jelly b/core/src/main/resources/hudson/model/Run/consoleFull.jelly
index 3312a8edfca0e0f90245f1bc9c3833fea76144e0..6e4a820d9d33fdf9ec6bbb2dcc627e128017f760 100644
--- a/core/src/main/resources/hudson/model/Run/consoleFull.jelly
+++ b/core/src/main/resources/hudson/model/Run/consoleFull.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:set var="consoleFull" value="true" />
   <st:include page="console.jelly" />
diff --git a/core/src/main/resources/hudson/model/Run/delete.jelly b/core/src/main/resources/hudson/model/Run/delete.jelly
index c2f0fd5bb1c3b2e4e245ab1bd749f91899867453..eb0804f27a4ea394e38eab10ef003cf9e4c21ab6 100644
--- a/core/src/main/resources/hudson/model/Run/delete.jelly
+++ b/core/src/main/resources/hudson/model/Run/delete.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Displays the button to delete the build.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:if test="${!it.keepLog and !it.building}">
     <form method="get" action="confirmDelete" style="margin-top:1em">
diff --git a/core/src/main/resources/hudson/model/Run/logKeep.jelly b/core/src/main/resources/hudson/model/Run/logKeep.jelly
index 1f4e55eb2eb71ca92355b79c65f085f7960fbf76..a33b78c6d9d313c95b55890aadaf856a7fd61f18 100644
--- a/core/src/main/resources/hudson/model/Run/logKeep.jelly
+++ b/core/src/main/resources/hudson/model/Run/logKeep.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Displays the toggle button to keep/don't-keep the log file.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:if test="${it.parent.logRotator!=null}">
     <form method="get" action="toggleLogKeep" style="margin-top:1em">
diff --git a/core/src/main/resources/hudson/model/StringParameterDefinition/config.jelly b/core/src/main/resources/hudson/model/StringParameterDefinition/config.jelly
index c6cdc7a9915651fec4365197feb07b7bcde3d5c3..a3d0a55a6ad9770aa532238f07255da6ffc02516 100644
--- a/core/src/main/resources/hudson/model/StringParameterDefinition/config.jelly
+++ b/core/src/main/resources/hudson/model/StringParameterDefinition/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/StringParameterDefinition/index.jelly b/core/src/main/resources/hudson/model/StringParameterDefinition/index.jelly
index 3fe0f53acddfee0d720a8637985e917706f73848..1fea88f777bba05e68a87ab243bd0edc338dae73 100644
--- a/core/src/main/resources/hudson/model/StringParameterDefinition/index.jelly
+++ b/core/src/main/resources/hudson/model/StringParameterDefinition/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/StringParameterValue/value.jelly b/core/src/main/resources/hudson/model/StringParameterValue/value.jelly
index 0bbebe6420530244f6eb4f504fc3321b352e8184..961a583d2920cdd2663ae7aef7a2a9646f70dcfa 100644
--- a/core/src/main/resources/hudson/model/StringParameterValue/value.jelly
+++ b/core/src/main/resources/hudson/model/StringParameterValue/value.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
diff --git a/core/src/main/resources/hudson/model/TreeView/ajaxRows.jelly b/core/src/main/resources/hudson/model/TreeView/ajaxRows.jelly
index 28a548ce42567985f3d28d74eec3fa31e4ca9b8e..91964029b010fcc7655fdf2affb6ac405c57bcc9 100644
--- a/core/src/main/resources/hudson/model/TreeView/ajaxRows.jelly
+++ b/core/src/main/resources/hudson/model/TreeView/ajaxRows.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used to render the folder content through an AJAX call.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:ajax>
     <t:setIconSize/>
diff --git a/core/src/main/resources/hudson/model/TreeView/main.jelly b/core/src/main/resources/hudson/model/TreeView/main.jelly
index 070f0befab3bd5b230d769ac9e74cc61ebe8afae..0f149020059f25c836d2118310e4ce712bf1c31d 100644
--- a/core/src/main/resources/hudson/model/TreeView/main.jelly
+++ b/core/src/main/resources/hudson/model/TreeView/main.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:choose>
     <j:when test="${empty(items)}">
diff --git a/core/src/main/resources/hudson/model/TreeView/newView.jelly b/core/src/main/resources/hudson/model/TreeView/newView.jelly
index 8df6b64a9f898842a6d6a501fc7c175e326e1535..9f22b566acf1cbb4fac9388e57694987537d15c7 100644
--- a/core/src/main/resources/hudson/model/TreeView/newView.jelly
+++ b/core/src/main/resources/hudson/model/TreeView/newView.jelly
@@ -22,4 +22,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <st:include from="${app}" page="newView.jelly" xmlns:st="jelly:stapler" />
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/TreeView/newViewDetail.jelly b/core/src/main/resources/hudson/model/TreeView/newViewDetail.jelly
index b118665daba61c307425baf8aac99f900e252783..b7c7ea16661326f62ffb76642549fd56ef30b785 100644
--- a/core/src/main/resources/hudson/model/TreeView/newViewDetail.jelly
+++ b/core/src/main/resources/hudson/model/TreeView/newViewDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <div>
   <b>Experimental:</b> show hierarchical views 
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/TreeView/sidepanel2.jelly b/core/src/main/resources/hudson/model/TreeView/sidepanel2.jelly
index b15b5f6c77c7a87900da1be1889f06fbe905cea9..3b8ac80aed0c8d85f4dae0f75fc99de014e62c98 100644
--- a/core/src/main/resources/hudson/model/TreeView/sidepanel2.jelly
+++ b/core/src/main/resources/hudson/model/TreeView/sidepanel2.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for the build view.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:task icon="images/32x32/folder.gif" href="newView" title="${%New View}"  permission="${it.CONFIGURE}" />
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Installing/status.jelly b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Installing/status.jelly
index 5e3934ee252df3c06d9734d405aaed3f40131be8..fe7c17549f9bd3cf760dcd1287aeab8bccf3bd2e 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Installing/status.jelly
+++ b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Installing/status.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div>
     <img src="${imagesURL}/24x24/grey_anime.gif" alt="" height="24" width="24"/> ${%Installing}
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Pending/status.jelly b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Pending/status.jelly
index 4f6c0ea68bbbb5e25e54d53cf4886293949ca6dc..1a74265b228c6c8be77cbcf8dfd0d881b41f5904 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Pending/status.jelly
+++ b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Pending/status.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <img src="${imagesURL}/24x24/grey.gif" alt="" height="24" width="24"/> ${%Pending}
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Success/status.jelly b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Success/status.jelly
index de52a70223ba612d53d0b315cf2eff9efba01f56..6629ebbd25bc50c1fa331e4961ac2f30d2bab958 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Success/status.jelly
+++ b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Success/status.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <img src="${imagesURL}/24x24/blue.gif" alt="" height="24" width="24"/> ${%Success}
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/body.jelly b/core/src/main/resources/hudson/model/UpdateCenter/body.jelly
index 6b4773c7384f199e0c48ee5279e6fe5739cf49cd..af306b90de64ce78ca11091a9f82b690fc91560c 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/body.jelly
+++ b/core/src/main/resources/hudson/model/UpdateCenter/body.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
   Requested by the browser separately to partially update the page.
   Also used as a part of index.jelly rendering.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:ajax>
     <table id="log">
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/index.jelly b/core/src/main/resources/hudson/model/UpdateCenter/index.jelly
index 7a685af58737c87b7106eea9de0cca86056c25db..dfd7d7a6b681879b51354145d58d77890d707b22 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/index.jelly
+++ b/core/src/main/resources/hudson/model/UpdateCenter/index.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
 <!--
   This page shows the status of the plugin installation
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="${%Update Center}" permission="${app.ADMINISTER}">
   <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/sidepanel.jelly b/core/src/main/resources/hudson/model/UpdateCenter/sidepanel.jelly
index 19443162145587cc0f61400f3d8c142319079e33..9014b877782309f4b76e8a95fa87972d2c47fd05 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/UpdateCenter/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:header />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/model/View/ajaxBuildQueue.jelly b/core/src/main/resources/hudson/model/View/ajaxBuildQueue.jelly
index 73731b8c0308acb3b9b52b93cf2b1f2348177e4a..c8eccf4f4a353ff78e00ced851f791af124fe9c3 100644
--- a/core/src/main/resources/hudson/model/View/ajaxBuildQueue.jelly
+++ b/core/src/main/resources/hudson/model/View/ajaxBuildQueue.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used to asynchronously update build queue
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:ajax>
     <t:queue items="${it.queueItems}" />
diff --git a/core/src/main/resources/hudson/model/View/ajaxExecutors.jelly b/core/src/main/resources/hudson/model/View/ajaxExecutors.jelly
index 3deb4e7da27a1d12d1f8126f721ed9c212557c09..715bd3fec21a52375ee2c75e71e999133bbc0dc0 100644
--- a/core/src/main/resources/hudson/model/View/ajaxExecutors.jelly
+++ b/core/src/main/resources/hudson/model/View/ajaxExecutors.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used to asynchronously update executor queue
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:ajax>
     <t:executors computers="${it.computers}"/>
diff --git a/core/src/main/resources/hudson/model/View/cc.xml.jelly b/core/src/main/resources/hudson/model/View/cc.xml.jelly
index 099f48340b3fac0008d53019d892ff486f54112d..46253ec93d1aec2e53fc5aa2f1624d20a4725590 100644
--- a/core/src/main/resources/hudson/model/View/cc.xml.jelly
+++ b/core/src/main/resources/hudson/model/View/cc.xml.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
   Generate status XML compatible with CruiseControl.
   See http://confluence.public.thoughtworks.org/display/CI/Multiple+Project+Summary+Reporting+Standard
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:contentType value="text/xml;charset=UTF-8" />
   <j:new var="h" className="hudson.Functions" />
diff --git a/core/src/main/resources/hudson/model/View/configure.jelly b/core/src/main/resources/hudson/model/View/configure.jelly
index e3bca1ecabdd8bd42c32d1039964e20941c4064f..b00f718629a2df8addc19233b881e3418cdc8e0a 100644
--- a/core/src/main/resources/hudson/model/View/configure.jelly
+++ b/core/src/main/resources/hudson/model/View/configure.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Edit View Page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout norefresh="true" title="${%Edit View}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/View/delete.jelly b/core/src/main/resources/hudson/model/View/delete.jelly
index 03f8a1ae52f0a597f2c145f0a0c2416f4d46d339..4af40c77b99f16a259847a4c633f328071d86cf3 100644
--- a/core/src/main/resources/hudson/model/View/delete.jelly
+++ b/core/src/main/resources/hudson/model/View/delete.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- Delete view -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
 	<l:layout>
 		<st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly
index 44b210bc1c8109dae1bf38a086caff1042099ded..65854d86ecde23583195f1a69d10c1948784eec9 100644
--- a/core/src/main/resources/hudson/model/View/index.jelly
+++ b/core/src/main/resources/hudson/model/View/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
     <j:new var="h" className="hudson.Functions" /><!-- instead of JSP functions -->
     <j:if test="${request.servletPath=='/' || request.servletPath==''}">
diff --git a/core/src/main/resources/hudson/model/View/main.jelly b/core/src/main/resources/hudson/model/View/main.jelly
index c746ab86af28c2aeecbcf503d89cc7cec5d80af6..51fd27bbc9730957f335aab7d835974a013052f3 100644
--- a/core/src/main/resources/hudson/model/View/main.jelly
+++ b/core/src/main/resources/hudson/model/View/main.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
     <j:choose>
         <j:when test="${empty(items)}">
diff --git a/core/src/main/resources/hudson/model/View/newJob.jelly b/core/src/main/resources/hudson/model/View/newJob.jelly
index 1cbdff15585e84afc38fcba9d67da5f5286d703c..74a3f6ddef6288efd9fa2ea642aba64bf3a4d3fc 100644
--- a/core/src/main/resources/hudson/model/View/newJob.jelly
+++ b/core/src/main/resources/hudson/model/View/newJob.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   "New Project" page.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <j:getStatic var="permission" className="hudson.model.Item" field="CREATE"/>
   <l:layout norefresh="true" permission="${permission}" title="${%New Job}">
diff --git a/core/src/main/resources/hudson/model/View/sidepanel.jelly b/core/src/main/resources/hudson/model/View/sidepanel.jelly
index 52212cf04ff645c46432cc029b04d4bb2232428b..cfd22a153308a4b3f104582ee34523f3ced6d696 100644
--- a/core/src/main/resources/hudson/model/View/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/View/sidepanel.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
 <!--
   Side panel for the build view.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:header title="Jenkins">
     <link rel="alternate" title="Jenkins:${it.viewName} (all builds)" href="${rootURL}/${it.url}rssAll" type="application/rss+xml" />
diff --git a/core/src/main/resources/hudson/model/labels/LabelAtom/configure.jelly b/core/src/main/resources/hudson/model/labels/LabelAtom/configure.jelly
index 8a3dabb887cff7727e02eb89b23d9f31b7858409..a6f3cb22e1943948bbd52d04eb754e839bde8015 100644
--- a/core/src/main/resources/hudson/model/labels/LabelAtom/configure.jelly
+++ b/core/src/main/resources/hudson/model/labels/LabelAtom/configure.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout norefresh="true" permission="${app.ADMINISTER}" title="${%title(it.displayName)}">
diff --git a/core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsBusy/summary.jelly b/core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsBusy/summary.jelly
index 2f6f6ebe45b3be8c5d547559f9de9dda4e457cc6..43a71e199c2c1ef23e74e8d804aaed37b6a804e9 100644
--- a/core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsBusy/summary.jelly
+++ b/core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsBusy/summary.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:structuredMessageFormat key="description">
     <st:structuredMessageArgument>
diff --git a/core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsOffline/summary.jelly b/core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsOffline/summary.jelly
index 2f6f6ebe45b3be8c5d547559f9de9dda4e457cc6..43a71e199c2c1ef23e74e8d804aaed37b6a804e9 100644
--- a/core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsOffline/summary.jelly
+++ b/core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsOffline/summary.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:structuredMessageFormat key="description">
     <st:structuredMessageArgument>
diff --git a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config.jelly b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config.jelly
index d050916defe0bda9a0c696446cb2538699b803a8..642ef96d34d7c919d8bea7b974212475beb00310 100644
--- a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config.jelly
+++ b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
   <f:entry title="${%Free Space Threshold}" field="freeSpaceThreshold">
     <f:textbox default="1GB"/>
diff --git a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause.jelly b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause.jelly
index 31cc91039f8831a0ae2ee9465122b601a3ddced9..6b16144546d7ec71525dfed2844507da1c78b6e9 100644
--- a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause.jelly
+++ b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <p class="error">${%Ping response time is too long or timed out.}</p>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message.jelly b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message.jelly
index 4b61f3822334793f7af76088400593968b50c247..cbdaec15352ddbd3f2637bacdb67f401c69c0444 100644
--- a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message.jelly
+++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div class="info">
     <form method="post" action="${rootURL}/${it.url}/disable">
diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index.jelly b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index.jelly
index 9696e171176ae9e1224ba42a3a1593657892d0bc..801b58f5968e0b9f0b2f9900212ddbd8d832b45a 100644
--- a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index.jelly
+++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${%ZFS Migration Problem}">
     <l:main-panel>
diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message.jelly b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message.jelly
index 1cdcec0a810aa605962e8302f0f2030299053d96..9ea4de36431872df8df48db4df1a0d0a7cfd2e3b 100644
--- a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message.jelly
+++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div class="error">
     ${%ZFS migration failed.}
diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/askRootPassword.jelly b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/askRootPassword.jelly
index 9ee3c4595a2bd319d2fcc49674cb944092b62b16..96bd2b5a3dc7102356b877ce73880bac788f5ae1 100644
--- a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/askRootPassword.jelly
+++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/askRootPassword.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout title="${%Permission Denied}">
     <l:header />
diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message.jelly b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message.jelly
index 1c9bc9276b191b6a3c8bbd7a2c3983357c802aca..83612b83d6516f867136d9ccf9604cc683c857f1 100644
--- a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message.jelly
+++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div class="warning">
     <form method="post" action="${rootURL}/${it.url}/act">
diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config.jelly b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config.jelly
index 8516d25bd4152b0d7d19ba0df62390be30099254..284043dd7bc3aab70d65cff41337f383426117c8 100644
--- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config.jelly
+++ b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceConnector/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:include page="config.jelly" class="${descriptor.CONFIG_DELEGATE_TO}"/>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.jelly b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.jelly
index f8f5e684eb7bcde6a1a9cd569daadfd71ef97fd8..c99e2491a2946a7adc50ded62194d13455eda79e 100644
--- a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.jelly
+++ b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Administrator user name}" field="userName">
     <f:textbox />
diff --git a/core/src/main/resources/hudson/scm/AbstractScmTagAction/badge.jelly b/core/src/main/resources/hudson/scm/AbstractScmTagAction/badge.jelly
index f43f6d5e4f278114806a05182a764b35d2ac2f56..b847e86616fd04b417933b0b360618d5dc9d4a33 100644
--- a/core/src/main/resources/hudson/scm/AbstractScmTagAction/badge.jelly
+++ b/core/src/main/resources/hudson/scm/AbstractScmTagAction/badge.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:if test="${it.isTagged()}" xmlns:j="jelly:core">
   <a href="${rootURL}/${it.build.url}tagBuild/">
     <img width="16" height="16"
diff --git a/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest.jelly b/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest.jelly
index 0294293c94c168e213d8a0f205359988b5aa7e9e..a568e5451827c7856214983699fcb99973098241 100644
--- a/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest.jelly
+++ b/core/src/main/resources/hudson/scm/EmptyChangeLogSet/digest.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   ${%No changes.}
 </j:jelly>
diff --git a/core/src/main/resources/hudson/scm/EmptyChangeLogSet/index.jelly b/core/src/main/resources/hudson/scm/EmptyChangeLogSet/index.jelly
index 37db1a16456a4384fafec70e40d06be291eb4f42..01eb7e063507c83e8304f82dbfbda243369d8527 100644
--- a/core/src/main/resources/hudson/scm/EmptyChangeLogSet/index.jelly
+++ b/core/src/main/resources/hudson/scm/EmptyChangeLogSet/index.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Displays the CVS change log.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <h2>
     <!-- just show "no changes" -->
diff --git a/core/src/main/resources/hudson/scm/NullSCM/config.jelly b/core/src/main/resources/hudson/scm/NullSCM/config.jelly
index ed9122347d4ead08f3c8ec8e6b5757f09e1ccc2f..368647627c47951ccac7c6e5f0f4dd4f0feecc7b 100644
--- a/core/src/main/resources/hudson/scm/NullSCM/config.jelly
+++ b/core/src/main/resources/hudson/scm/NullSCM/config.jelly
@@ -23,4 +23,5 @@ THE SOFTWARE.
 -->
 
 <!-- nothing to configure -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core"  />
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config.jelly b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config.jelly
index e10b214672512062970514c344a0cd06bcce382e..b3a219bc7a181b93a202c7cd1eaa2a8a1821a8c0 100644
--- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config.jelly
+++ b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:optionalBlock name="useProjectSecurity" title="${%Enable project-based security}" checked="${instance!=null}">
     <st:include page="/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly" />
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config.jelly
index 2bd49602f097a29abba6136643a72a7863c5f7d0..f97a4c9e9e93d8436b41928cf71b9e5e32dc5330 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:if test="${descriptor.enabled}">
     <f:entry title="${%Password}:">
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly
index f1eef45a07e72dccfb137d587e9df719f2a8d121..aed3d5c5c89b8e30db8a050ad3b2ed2bf2821aae 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Page for admin to create a new user
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <local:_entryForm host="${it}" title="${%Create User}" action="createAccountByAdmin" captcha="${false}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
index b3704be5bcddbf3efdeca27434e3c1b16861e47a..454d733f2ec143d3c9a0c375e95d9aec19d650ac 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<f:entry title="" help="/help/security/private-realm/allow-signup.html">
 	  <f:checkbox name="privateRealm.allowsSignup" checked="${h.defaultToTrue(instance.allowsSignup())}"
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly
index 815296d71ef2ca2277d013f5e2d489e067127c4f..bc44b42accee8be4b4b2b19ed6646f5735b1376c 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   This is used to create the first user.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <local:_entryForm host="${it}" title="${%Create First Admin User}" action="createFirstAccount" captcha="${false}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/loginLink.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/loginLink.jelly
index 1ae8de3123d31efc71c8d739da84f114887fc1d9..c2ef8305fa4827837d80e7c70a3665304b228549 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/loginLink.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/loginLink.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout">
   <st:include page="/hudson/security/SecurityRealm/loginLink.jelly" />
   <j:if test="${it.allowsSignup()}">
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel.jelly
index 204d5afb3aa9fb806ff71695c9b51f622fc51106..465c3a6c2464cd612e3ab34c2201e53a169907f7 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:header />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
index bbd78f80bb7a08dbcb1ecc56a9a9c4e4dbbe376c..3246288fc8b3f11c54f48167f8f18fa8b55b965c 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   User self sign up page.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <local:_entryForm host="${app}" title="${%Sign up}" action="createAccount" captcha="${true}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly
index dfe99a39358d159da222b1e97e14293e3279818e..01c0197a6201335932e0ffb50df2934937c44242 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   User self sign up page.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <local:_entryForm host="${app}" title="${%Sign up}" action="createAccountWithFederatedIdentity" captcha="${true}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/LDAPSecurityRealm/config.jelly b/core/src/main/resources/hudson/security/LDAPSecurityRealm/config.jelly
index 7818d8bb724ff96f9c1c255a4a0a9ed0e7dbe864..0f8cc20e389874500abbae453ff493794e996520 100644
--- a/core/src/main/resources/hudson/security/LDAPSecurityRealm/config.jelly
+++ b/core/src/main/resources/hudson/security/LDAPSecurityRealm/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<f:entry title="${%Server}" help="/help/security/ldap/server.html">
 	  <f:textbox name="ldap.server" value="${instance.server}"
diff --git a/core/src/main/resources/hudson/security/PAMSecurityRealm/config.jelly b/core/src/main/resources/hudson/security/PAMSecurityRealm/config.jelly
index 374b7cf1291108c39e682e26546c8eeebf38c525..7d51c030c63ab732fc755cb2863b0a27dd57d85e 100644
--- a/core/src/main/resources/hudson/security/PAMSecurityRealm/config.jelly
+++ b/core/src/main/resources/hudson/security/PAMSecurityRealm/config.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:advanced>
     <f:entry title="${%Service Name}">
diff --git a/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly b/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
index 3c18e5e61c34160ad3d9024b731b5c006e67e251..ac3d0a0f379a90d5e5453a8c5a1f0458ecb9f74a 100644
--- a/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
+++ b/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
@@ -23,6 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <j:invokeStatic var="from" className="java.net.URLEncoder" method="encode">
     <j:arg value="${if (request.session.attribute('from')!=null) request.session.getAttribute('from');  else if (request.getParameter('from')!=null) request.getParameter('from'); else if (request.requestURI=='/loginError' || request.requestURI=='/login') '/'; else request.requestURI;}"/>
diff --git a/core/src/main/resources/hudson/security/csrf/DefaultCrumbIssuer/config.jelly b/core/src/main/resources/hudson/security/csrf/DefaultCrumbIssuer/config.jelly
index c216bfc3d1ce1872dfca30156ee587685e985cce..573cc325c288f21aa114183b5b4034303c8f0331 100644
--- a/core/src/main/resources/hudson/security/csrf/DefaultCrumbIssuer/config.jelly
+++ b/core/src/main/resources/hudson/security/csrf/DefaultCrumbIssuer/config.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <f:entry title="" field="excludeClientIPFromCrumb">
         <f:checkbox checked="${instance.isExcludeClientIPFromCrumb()}" title="${%Enable proxy compatibility}" />
diff --git a/core/src/main/resources/hudson/slaves/CommandConnector/config.jelly b/core/src/main/resources/hudson/slaves/CommandConnector/config.jelly
index 1da8b8673fb8b21304b38a40e79fa2d23a997715..37b017955d686740d714e6c44ee4b9a3e4c515c3 100644
--- a/core/src/main/resources/hudson/slaves/CommandConnector/config.jelly
+++ b/core/src/main/resources/hudson/slaves/CommandConnector/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Launch command}" field="command">
     <f:textbox />
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/config.jelly b/core/src/main/resources/hudson/slaves/CommandLauncher/config.jelly
index 1da8b8673fb8b21304b38a40e79fa2d23a997715..37b017955d686740d714e6c44ee4b9a3e4c515c3 100644
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/config.jelly
+++ b/core/src/main/resources/hudson/slaves/CommandLauncher/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Launch command}" field="command">
     <f:textbox />
diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help.jelly b/core/src/main/resources/hudson/slaves/CommandLauncher/help.jelly
index de000a18456efa4619ebb8ac3208d4f55968cd4c..f326f7fa2862ebead7c7b7a83dd9708bf7bba208 100644
--- a/core/src/main/resources/hudson/slaves/CommandLauncher/help.jelly
+++ b/core/src/main/resources/hudson/slaves/CommandLauncher/help.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   ${%blurb}
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main.jelly b/core/src/main/resources/hudson/slaves/ComputerLauncher/main.jelly
index 268d63eab95009f12c8f61b91f8b65731f925fbd..658b8a1312fa1c3d7543ae32e4775e00bccfc1fa 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncher/main.jelly
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:if test="${it.launchSupported and it.offline and !it.temporarilyOffline}">
     <j:choose>
diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncherFilter/main.jelly b/core/src/main/resources/hudson/slaves/ComputerLauncherFilter/main.jelly
index bb72b27f3766e25c01b820a49aeaef08af610618..7db3e308dc16ae4c55d30f5765a2a5e2442a9a1a 100644
--- a/core/src/main/resources/hudson/slaves/ComputerLauncherFilter/main.jelly
+++ b/core/src/main/resources/hudson/slaves/ComputerLauncherFilter/main.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:include it="${it.core}" page="main.jelly" />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/DelegatingComputerLauncher/config.jelly b/core/src/main/resources/hudson/slaves/DelegatingComputerLauncher/config.jelly
index 1a64eaf3efb0c193a274783eeb4b00e1946ebac8..843cb9d3c9c30162f5c8fa28f020ce9b0abc21b0 100644
--- a/core/src/main/resources/hudson/slaves/DelegatingComputerLauncher/config.jelly
+++ b/core/src/main/resources/hudson/slaves/DelegatingComputerLauncher/config.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
index 2ad0f99bab32fa3e1f5405568d3c2016c405af4c..4ce1d08718c5f392abe25e260f2d49af5f4b4158 100644
--- a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
+++ b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Description}" help="/help/system-config/master-slave/description.html">
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail.jelly b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail.jelly
index 276fcee7d39b49492af36f6f1a06ed85c8435d3c..8b3ac49a7af724286195cfbfe9c67ff759459e12 100644
--- a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail.jelly
+++ b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <div>
   ${%detail}
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly
index 74dbd1fae86544adf2941ccbd3399877802eaec8..9cd7fbc2e62435eea4c88448b14e1f1b1419eb8e 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%List of key-value pairs}" help="${descriptor.getHelpPage()}">
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/config.jelly b/core/src/main/resources/hudson/slaves/JNLPLauncher/config.jelly
index 511de81344ea1e4551006ca59d2d6790792eba53..b1d938a50dce1984caf5769c75a31e864e0ff0fb 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/config.jelly
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:advanced>
     <f:entry title="${%Tunnel connection through}" help="/help/system-config/master-slave/jnlp-tunnel.html">
diff --git a/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config.jelly b/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config.jelly
index 8ee51db5173e12e53b048019bf8bb419ce3db4b8..75d39e38515e7c92ba00e793f8e8b54de69feea7 100644
--- a/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config.jelly
+++ b/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <f:entry title="${%In demand delay}" help="/help/system-config/master-slave/demand/inDemandDelay.html">
diff --git a/core/src/main/resources/hudson/slaves/RetentionStrategy/Scheduled/config.jelly b/core/src/main/resources/hudson/slaves/RetentionStrategy/Scheduled/config.jelly
index 8b65dbf128e6dd6f0c58400efc2c37fccc01da9e..d6c1c24f5f5ec3f96a9a7e803cad4d1d7c61a741 100644
--- a/core/src/main/resources/hudson/slaves/RetentionStrategy/Scheduled/config.jelly
+++ b/core/src/main/resources/hudson/slaves/RetentionStrategy/Scheduled/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <f:entry title="${%Startup Schedule}" help="/descriptor/hudson.triggers.TimerTrigger/help/spec">
diff --git a/core/src/main/resources/hudson/slaves/RetentionStrategy/config.jelly b/core/src/main/resources/hudson/slaves/RetentionStrategy/config.jelly
index da075705ae013babea27f06d99cbe85d7bc46a78..5b00cf6cd7ddbe30bfc3d3b5b40416f5e8a46df1 100644
--- a/core/src/main/resources/hudson/slaves/RetentionStrategy/config.jelly
+++ b/core/src/main/resources/hudson/slaves/RetentionStrategy/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly
index 839dca3a8cef2598736e32830bd872b5eaffccf1..707aec5ed0078501bf7a25db4b5f9f7acdee244f 100644
--- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly
+++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <f:entry title="${%Startup Schedule}"  help="/descriptor/hudson.triggers.TimerTrigger/help/spec">
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect.jelly
index dd85e41359e6a12bdb495a9dc85086b87331da1e..a00030214990b0e815dd43030e33ad8dc361fbff 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect.jelly
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- Disconnect confirmation -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName} ${%disconnect}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly
index 3a9b60fa0d4f2144a0f8b2e2486c461b5e820a9a..9d2be8d47b77e43c2e212d3d4d74b67abdd81b28 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName} log" secured="true">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2.jelly
index e7332d59d4823583f57b446c56f181ff72c921de..c3962e34151d29ae979b3588f769183bad9593e4 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2.jelly
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:isAdmin>
     <l:task icon="images/24x24/clipboard.gif" href="log" title="${%Log}" />
diff --git a/core/src/main/resources/hudson/tasks/Ant/AntInstallation/config.jelly b/core/src/main/resources/hudson/tasks/Ant/AntInstallation/config.jelly
index 6bbc6b1710fae1eff1683b2a4b21b7925939df1f..ee6e04cf2a33d77f7d15289f53713e062265077a 100644
--- a/core/src/main/resources/hudson/tasks/Ant/AntInstallation/config.jelly
+++ b/core/src/main/resources/hudson/tasks/Ant/AntInstallation/config.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Name}" field="name">
     <f:textbox />
diff --git a/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly b/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
index 32d2770cb512d70850dc16c7749e019ca28a2e68..5a6e89a699ddd8d9302c8b1ad001d1ee7009bb7c 100644
--- a/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
+++ b/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<f:entry title="${%Files to archive}" field="artifacts">
 	  <f:textbox />
diff --git a/core/src/main/resources/hudson/tasks/BatchFile/config.jelly b/core/src/main/resources/hudson/tasks/BatchFile/config.jelly
index a5f747511b414f5e13d8c31b9d6929cdb300bab3..35e5f89c41f8d4e87cee4fe4ddda4607cc91727f 100644
--- a/core/src/main/resources/hudson/tasks/BatchFile/config.jelly
+++ b/core/src/main/resources/hudson/tasks/BatchFile/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Command}"
            description="${%description(rootURL)}">
diff --git a/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly b/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly
index d1a50afe4d23fc75f504ff813d4621fdafa3687c..eb3c3db6937b85a89092303027376e6c2bbcc725 100644
--- a/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly
+++ b/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<f:entry title="${%Projects to build}">
 	  <f:textbox name="buildTrigger.childProjects" value="${instance.childProjectsValue}"
diff --git a/core/src/main/resources/hudson/tasks/JavadocArchiver/config.jelly b/core/src/main/resources/hudson/tasks/JavadocArchiver/config.jelly
index b664e2ba9e575c449bc980bde2671ba64cd590e1..fce9e41c1bc42ff7799f1b8d79670fd27e8ae023 100644
--- a/core/src/main/resources/hudson/tasks/JavadocArchiver/config.jelly
+++ b/core/src/main/resources/hudson/tasks/JavadocArchiver/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Javadoc directory}"
     description="${%description}">
diff --git a/core/src/main/resources/hudson/tasks/LogRotator/config.jelly b/core/src/main/resources/hudson/tasks/LogRotator/config.jelly
index 3194d47512a5264e70db9d2af9455ff8ab4d75d9..0c3da6362929745a3e56707b5b380e6a3d0aed2e 100644
--- a/core/src/main/resources/hudson/tasks/LogRotator/config.jelly
+++ b/core/src/main/resources/hudson/tasks/LogRotator/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Days to keep builds}"
     description="${%if not empty, build records are only kept up to this number of days}">
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config.jelly b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config.jelly
index 3d25e5f0270ee04c2024e22d9e8dad64a8e358bc..d2b1064778cc2599885b1cd33bc575037dc93ad9 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config.jelly
+++ b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%E-mail address}"
     description="${%description}">
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config.jelly b/core/src/main/resources/hudson/tasks/Mailer/config.jelly
index 7c53e5d57d51addf5fdd2b8d7dafc8863c9b4ee5..a904d86142b4bf95c8842232d5e2ca316215f215 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/config.jelly
+++ b/core/src/main/resources/hudson/tasks/Mailer/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Recipients}" description="${%description}">
     <f:textbox name="mailer_recipients" value="${instance.recipients}"/>
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global.jelly b/core/src/main/resources/hudson/tasks/Mailer/global.jelly
index d13b8f5c88f03f4c04ae2badb76f51a29d482dac..86a2f50d09b807b77a3d6559b19b26aa86b2f0ac 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/global.jelly
+++ b/core/src/main/resources/hudson/tasks/Mailer/global.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:section title="${%E-mail Notification}">
     <f:entry title="${%SMTP server}" field="smtpServer">
diff --git a/core/src/main/resources/hudson/tasks/Maven/MavenInstallation/config.jelly b/core/src/main/resources/hudson/tasks/Maven/MavenInstallation/config.jelly
index e631af52752ba6206166e3c18d496445bb0e4067..e33083850b2419dd47be54bd7ce292b7dabbdd79 100644
--- a/core/src/main/resources/hudson/tasks/Maven/MavenInstallation/config.jelly
+++ b/core/src/main/resources/hudson/tasks/Maven/MavenInstallation/config.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Name}" field="name">
     <f:textbox />
diff --git a/core/src/main/resources/hudson/tasks/Shell/config.jelly b/core/src/main/resources/hudson/tasks/Shell/config.jelly
index f7ee189fd9aeb02a7be41ff1ae06a0173d5a3ead..bea70c99d65b549a335a6d144b0c8500718981fa 100644
--- a/core/src/main/resources/hudson/tasks/Shell/config.jelly
+++ b/core/src/main/resources/hudson/tasks/Shell/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Command}" description="${%description(rootURL)}">
     <f:textarea name="command" value="${instance.command}" class="fixed-width" />
diff --git a/core/src/main/resources/hudson/tasks/Shell/global.jelly b/core/src/main/resources/hudson/tasks/Shell/global.jelly
index 1041c6fe4ddfc40d08ee5510ee72b56a2803b1fa..cd5a3e2304e38e33c01f97292a1e8fc3f8cf2bbd 100644
--- a/core/src/main/resources/hudson/tasks/Shell/global.jelly
+++ b/core/src/main/resources/hudson/tasks/Shell/global.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:section title="${%Shell}">
     <f:entry title="${%Shell executable}" help="/help/shell/shellexe.html">
diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly b/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly
index c92bb263eaa6436cb83146bb3d91847abfccff61..9b002212eeb9b2f57b8dd1ad1d5385cf8ad90632 100644
--- a/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly
+++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!--  this is loaded on demand in the failed test results summary -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
          xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:contentType value="text/plain"/>
diff --git a/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config.jelly b/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config.jelly
index 37436e5d3d4de642e392e28b2c4e31740eb5d394..dfa7825a3f381f0be6707cf0c67222e498853db1 100644
--- a/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config.jelly
+++ b/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config.jelly
@@ -23,6 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<f:entry title="${%Test report XMLs}" field="testResults"
diff --git a/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/config.jelly b/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/config.jelly
index ec5920d6f16c9f3ab28abfd9bd22b5965b75e816..0102ba7ee4af026cd99b6444f1ddc3867b50023a 100644
--- a/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/config.jelly
+++ b/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:nested>
     <table style="width:100%">
diff --git a/core/src/main/resources/hudson/tasks/test/TestObject/sidepanel.jelly b/core/src/main/resources/hudson/tasks/test/TestObject/sidepanel.jelly
index ec59415587c1255eff50dc16bb36ed9f74aa7b6b..4809dec595a4532cde79591393993ccbfebcbb17 100644
--- a/core/src/main/resources/hudson/tasks/test/TestObject/sidepanel.jelly
+++ b/core/src/main/resources/hudson/tasks/test/TestObject/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for the build view.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:header />
   <l:side-panel>
diff --git a/core/src/main/resources/hudson/tasks/test/TestResultProjectAction/floatingBox.jelly b/core/src/main/resources/hudson/tasks/test/TestResultProjectAction/floatingBox.jelly
index 60e610486dbd303908ede2de24c01ad6209cd6f1..3f6f158e11888fafd59cedf10d9242bec1383eb6 100644
--- a/core/src/main/resources/hudson/tasks/test/TestResultProjectAction/floatingBox.jelly
+++ b/core/src/main/resources/hudson/tasks/test/TestResultProjectAction/floatingBox.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:local="local">
   <j:set var="tr" value="${action.lastTestResultAction}" />
   <j:if test="${tr.previousResult!=null}">
diff --git a/core/src/main/resources/hudson/tasks/test/TestResultProjectAction/index.jelly b/core/src/main/resources/hudson/tasks/test/TestResultProjectAction/index.jelly
index dc9ccf924ddb7a1950564c44650752e749ca0f40..e63803a6facffd85bc4e6277dd6a2bb12232e8b7 100644
--- a/core/src/main/resources/hudson/tasks/test/TestResultProjectAction/index.jelly
+++ b/core/src/main/resources/hudson/tasks/test/TestResultProjectAction/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:local="local">
   <l:layout title="Test">
     <st:include page="sidepanel.jelly" it="${it.project}" />
diff --git a/core/src/main/resources/hudson/tools/CommandInstaller/config.jelly b/core/src/main/resources/hudson/tools/CommandInstaller/config.jelly
index 72f569b9da1a13f947e7871dff43ec04c48c9c2a..3523fbb09f3326d5d34e246e0b5f28063b6b39fe 100644
--- a/core/src/main/resources/hudson/tools/CommandInstaller/config.jelly
+++ b/core/src/main/resources/hudson/tools/CommandInstaller/config.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler" xmlns:t="/hudson/tools">
     <t:label />
     <f:entry title="${%Command}" field="command">
diff --git a/core/src/main/resources/hudson/tools/InstallSourceProperty/config.jelly b/core/src/main/resources/hudson/tools/InstallSourceProperty/config.jelly
index bcb8d1ada17d5c6685d4f83606569bb4804b03d7..d9d8012101e17f9045b939b4101aba0640822d95 100644
--- a/core/src/main/resources/hudson/tools/InstallSourceProperty/config.jelly
+++ b/core/src/main/resources/hudson/tools/InstallSourceProperty/config.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
     <f:block>
         <j:invokeStatic var="descriptors" className="hudson.tools.ToolInstallerDescriptor" method="for_">
diff --git a/core/src/main/resources/hudson/tools/ToolInstallation/config.jelly b/core/src/main/resources/hudson/tools/ToolInstallation/config.jelly
index 5bc68fd965931c6dbde733308b5d59d42bb410de..efba856fca62680102d7b96ff530c436511532c4 100644
--- a/core/src/main/resources/hudson/tools/ToolInstallation/config.jelly
+++ b/core/src/main/resources/hudson/tools/ToolInstallation/config.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Per ToolInstallation configuration page added to the system configuration.
diff --git a/core/src/main/resources/hudson/tools/ToolInstallation/global.jelly b/core/src/main/resources/hudson/tools/ToolInstallation/global.jelly
index de99bab5dd3b6210bf812ac2862d31f0507e8155..6862cdf0b477abebe655c4e74f556323a4c6f7b0 100644
--- a/core/src/main/resources/hudson/tools/ToolInstallation/global.jelly
+++ b/core/src/main/resources/hudson/tools/ToolInstallation/global.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:section title="${descriptor.displayName}">
     <f:entry title="${%title(descriptor.displayName)}" description="${%description(descriptor.displayName)}">
diff --git a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/config.jelly b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/config.jelly
index 1242f8173d10352b772a9b1ad7aeab455bf44980..952041a19f1d1cc6c9dac8372e9fad028c21f2cf 100644
--- a/core/src/main/resources/hudson/tools/ZipExtractionInstaller/config.jelly
+++ b/core/src/main/resources/hudson/tools/ZipExtractionInstaller/config.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler" xmlns:t="/hudson/tools">
     <t:label />
     <f:entry title="${%Download URL for binary archive}" field="url">
diff --git a/core/src/main/resources/hudson/tools/label.jelly b/core/src/main/resources/hudson/tools/label.jelly
index d82417033f41654d384601dd7fabb621ef3d0d95..70138d1caa25c3ce6292c1718a04628726331e96 100644
--- a/core/src/main/resources/hudson/tools/label.jelly
+++ b/core/src/main/resources/hudson/tools/label.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler">
     <st:documentation>
         Puts the input field for allowing an user to limit this installer to a certain label.
diff --git a/core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly b/core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly
index 7b4b9ada7ea5ceb5bc22bf89d26f826d84272432..9b6d78e9227bf1689b40a90ce2f5db060dc5aeac 100644
--- a/core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly
+++ b/core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Schedule}" help="/descriptor/hudson.triggers.TimerTrigger/help/spec">
     <f:textarea name="scmpoll_spec" checkUrl="'${rootURL}/trigger/TimerTrigger/check?value='+encodeURIComponent(this.value)" value="${instance.spec}"/>
diff --git a/core/src/main/resources/hudson/triggers/SCMTrigger/global.jelly b/core/src/main/resources/hudson/triggers/SCMTrigger/global.jelly
index 3a5d86da2ff6b48670a9b54dd235b501b1ac674d..43aef5f977ee9a6884d4f6518b0027c4ba289f36 100644
--- a/core/src/main/resources/hudson/triggers/SCMTrigger/global.jelly
+++ b/core/src/main/resources/hudson/triggers/SCMTrigger/global.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:if test="${app.items.size()>10}">
     <!--
diff --git a/core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly b/core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly
index 984a055e730dfb3617fa26228179f1c53c705c3d..d7a86aa9662cdae0e072393b8f9940ca9e3d5d4a 100644
--- a/core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly
+++ b/core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Schedule}" field="spec">
     <f:textarea />
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly b/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly
index 7fbd5fb92805c7f1856e679c7bc8aeebf4177ceb..625be9422f467f91eb2e3d661d8459a15dfd28d3 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:statusCode value="503" /><!-- SERVICE NOT AVAILABLE -->
   <l:layout title="Jenkins">
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly
index 7fbf66998e9e289ad6dd992cf72df5eef9e0d8b1..65e8bb6e4574591d77bfbd7e21343cefa7ac6cf9 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:statusCode value="503" /><!-- SERVICE NOT AVAILABLE -->
   <l:layout>
diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
index 9813dd62c863950656da32f599bdff45556b3043..9296682ca15ac3b955a6866b745951e314ce463f 100644
--- a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
       <td>
           <j:if test="${job.buildable and job.hasPermission(job.BUILD)}">
diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/columnHeader.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/columnHeader.jelly
index 927d9a48a4c303c1a763ca1b5123f1ac18ff3973..1d7825c40c12422fbf7cbb2f62ece539aa5133bc 100644
--- a/core/src/main/resources/hudson/views/BuildButtonColumn/columnHeader.jelly
+++ b/core/src/main/resources/hudson/views/BuildButtonColumn/columnHeader.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
     <th width="1">
         <st:nbsp/>
diff --git a/core/src/main/resources/hudson/views/DefaultMyViewsTabBar/myViewTabs.jelly b/core/src/main/resources/hudson/views/DefaultMyViewsTabBar/myViewTabs.jelly
index 03b90be35a0026f5a28880217644fb9f1ef8c5cc..10b55865f6aef2cf8ce977f243f4b32a87362a0c 100644
--- a/core/src/main/resources/hudson/views/DefaultMyViewsTabBar/myViewTabs.jelly
+++ b/core/src/main/resources/hudson/views/DefaultMyViewsTabBar/myViewTabs.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <!-- view tab bar -->
   <l:tabBar>
diff --git a/core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs.jelly b/core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs.jelly
index 03b90be35a0026f5a28880217644fb9f1ef8c5cc..10b55865f6aef2cf8ce977f243f4b32a87362a0c 100644
--- a/core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs.jelly
+++ b/core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <!-- view tab bar -->
   <l:tabBar>
diff --git a/core/src/main/resources/hudson/views/JobColumn/columnHeader.jelly b/core/src/main/resources/hudson/views/JobColumn/columnHeader.jelly
index 127854f319b2fc65f0aff6fb271e8ae03603b152..453392129bc426015786727f10334e98221261e6 100644
--- a/core/src/main/resources/hudson/views/JobColumn/columnHeader.jelly
+++ b/core/src/main/resources/hudson/views/JobColumn/columnHeader.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
     <th initialSortDir="down">${%Job}</th>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/views/LastDurationColumn/columnHeader.jelly b/core/src/main/resources/hudson/views/LastDurationColumn/columnHeader.jelly
index a316d245647fc28b09c85d8a49d976bc54157ee4..b00d8b41292ef58bf827aa109f50971b304201bc 100644
--- a/core/src/main/resources/hudson/views/LastDurationColumn/columnHeader.jelly
+++ b/core/src/main/resources/hudson/views/LastDurationColumn/columnHeader.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
     <th>${%Last Duration}</th>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/views/LastFailureColumn/columnHeader.jelly b/core/src/main/resources/hudson/views/LastFailureColumn/columnHeader.jelly
index 8d7490afd7f35cc1cd90ee9c5b1c3bf8624bbd15..9bd477572d5d9bb52a6d4cfc00c6dce03c4721ca 100644
--- a/core/src/main/resources/hudson/views/LastFailureColumn/columnHeader.jelly
+++ b/core/src/main/resources/hudson/views/LastFailureColumn/columnHeader.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
     <th>${%Last Failure}</th>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/views/LastStableColumn/columnHeader.jelly b/core/src/main/resources/hudson/views/LastStableColumn/columnHeader.jelly
index 81e749b382a1cda55c6f0c0f8779675b1df25e7f..463770caed75df25cf37a6fec2b0558d1424955f 100644
--- a/core/src/main/resources/hudson/views/LastStableColumn/columnHeader.jelly
+++ b/core/src/main/resources/hudson/views/LastStableColumn/columnHeader.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
     <th>${%Last Stable}</th>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/views/LastSuccessColumn/columnHeader.jelly b/core/src/main/resources/hudson/views/LastSuccessColumn/columnHeader.jelly
index 42a03d4810b07f5bf8087141f4eef9d6bb04e1ed..ad96e16780bff777efb407a92f2245223df085b0 100644
--- a/core/src/main/resources/hudson/views/LastSuccessColumn/columnHeader.jelly
+++ b/core/src/main/resources/hudson/views/LastSuccessColumn/columnHeader.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
     <th>${%Last Success}</th>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/views/ListViewColumn/config.jelly b/core/src/main/resources/hudson/views/ListViewColumn/config.jelly
index 75d61b9f10f1dfa466d0c12f2bbda22760010170..db84a4b002baff1dc7542d42aacaac23e478e2a1 100644
--- a/core/src/main/resources/hudson/views/ListViewColumn/config.jelly
+++ b/core/src/main/resources/hudson/views/ListViewColumn/config.jelly
@@ -23,4 +23,5 @@ THE SOFTWARE.
 -->
 
 <!-- Columns normally have nothing to configure. -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core"/>
diff --git a/core/src/main/resources/hudson/views/StatusColumn/column.jelly b/core/src/main/resources/hudson/views/StatusColumn/column.jelly
index 0abb54f0c90c3777d18c0016a2d8032f86b411b3..b6a77213567586dc29ca1defbfabb23bb4800f64 100644
--- a/core/src/main/resources/hudson/views/StatusColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/StatusColumn/column.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
     <t:ballColorTd it="${job.iconColor}" style="${indenter.getRelativeShift(job)}"/>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/views/WeatherColumn/column.jelly b/core/src/main/resources/hudson/views/WeatherColumn/column.jelly
index 92616c87e176119c3715662f7a8468b891f8d274..50e49416fcc1f0b28a5da6d682b4d579601aa23b 100644
--- a/core/src/main/resources/hudson/views/WeatherColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/WeatherColumn/column.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
     <t:buildHealth td="true" style="${indenter.getRelativeShift(job)}"
       link="${jobBaseUrl}${job.shortUrl}lastBuild"/>
diff --git a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
index a2e3d1987d3669c5ba9b0b4c15a93c22d66e6a0f..0b5041c1ff1fa150cb4a1d6d9d8b2bc16271abaf 100644
--- a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
+++ b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Render build histories.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <!-- pending build -->
   <j:set var="queuedItems" value="${it.queuedItems}" />
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/ajaxBuildHistory.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/ajaxBuildHistory.jelly
index 885ca24afc44d86cc7cccaa72c78b5f619bf239f..9dc63f6938a0267098fde9ec8664c4efbf969595 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/ajaxBuildHistory.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/ajaxBuildHistory.jelly
@@ -24,6 +24,7 @@ THE SOFTWARE.
 
 <!--
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:ajax>
     <table>
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/all.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/all.jelly
index a945af8d0aadaeba7404aadd18f01c231e600450..6bb5e1c36da1408605f8798ac667dbc1266842c6 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/all.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/all.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used by buildHistory.jelly to lazily fetch the complete build records.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout">
   <l:ajax>
     <j:set var="all" value="${true}"/>
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entries.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entries.jelly
index 40dffd843fd8724428d1bea364af36568b939c8c..2a49d5a6981c971ed4f312d492dd6668c7df5713 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/entries.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entries.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Render build histories. 
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:set target="${it}" property="nextBuildNumberToFetch" value="${it.owner.nextBuildNumber}"/>
   <!-- build history -->
diff --git a/core/src/main/resources/lib/form/advanced.jelly b/core/src/main/resources/lib/form/advanced.jelly
index f18f772c5a5d7d51fab97b1cd8858f77b1beba8d..7d12f405f0305d1bd8d02f2ee8fee8d8211f8548 100644
--- a/core/src/main/resources/lib/form/advanced.jelly
+++ b/core/src/main/resources/lib/form/advanced.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Expandable section that shows "advanced..." button by default.
diff --git a/core/src/main/resources/lib/form/block.jelly b/core/src/main/resources/lib/form/block.jelly
index 224e6ffd59eda0abaabff2d8452847eb26dc8b0a..589a868100e8bd91c0fc2b31ff903beb4e9b100d 100644
--- a/core/src/main/resources/lib/form/block.jelly
+++ b/core/src/main/resources/lib/form/block.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Full-width space in the form table that can be filled with arbitrary HTML.
diff --git a/core/src/main/resources/lib/form/description.jelly b/core/src/main/resources/lib/form/description.jelly
index 60d7c179d2ce6694cc828766ddd9fed8b0e7822e..0750917f33de1c84926310880d2ce28ee95b77b0 100644
--- a/core/src/main/resources/lib/form/description.jelly
+++ b/core/src/main/resources/lib/form/description.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Renders a row that shows description text below an input field.
diff --git a/core/src/main/resources/lib/form/descriptorList.jelly b/core/src/main/resources/lib/form/descriptorList.jelly
index 3a3d1b745761af8ef79a0c60e98c630eeb1d7992..54973dc40389c57e0523ca04958efd1d7567a977 100644
--- a/core/src/main/resources/lib/form/descriptorList.jelly
+++ b/core/src/main/resources/lib/form/descriptorList.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Generate config pages from a list of Descriptors into a section.
diff --git a/core/src/main/resources/lib/form/descriptorRadioList.jelly b/core/src/main/resources/lib/form/descriptorRadioList.jelly
index a5907ddae6ec12cc84c4bd5c7ab7da5916ffa703..5193df8043deab141e84528fa2e47cc82c2ec52b 100644
--- a/core/src/main/resources/lib/form/descriptorRadioList.jelly
+++ b/core/src/main/resources/lib/form/descriptorRadioList.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Generate config pages from a list of Descriptors into a section.
diff --git a/core/src/main/resources/lib/form/dropdownDescriptorSelector.jelly b/core/src/main/resources/lib/form/dropdownDescriptorSelector.jelly
index 714c97fd48f56f6ef7a1503e5796cfe0e6907dda..02e99d33f37d41b9f40fd9df8825f334b047484c 100644
--- a/core/src/main/resources/lib/form/dropdownDescriptorSelector.jelly
+++ b/core/src/main/resources/lib/form/dropdownDescriptorSelector.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Renders a single &lt;select> control for choosing a Describable.
diff --git a/core/src/main/resources/lib/form/editableComboBox.jelly b/core/src/main/resources/lib/form/editableComboBox.jelly
index 2ba8edd42562c85838022af3c157a5d0e038493e..f82c07ae7381929cce40416e8037003206e69359 100644
--- a/core/src/main/resources/lib/form/editableComboBox.jelly
+++ b/core/src/main/resources/lib/form/editableComboBox.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- Tomcat doesn't like us using the attribute called 'class' -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Editable drop-down combo box. Deprecated as of 1.356. Use f:combobox and databinding instead.
diff --git a/core/src/main/resources/lib/form/editableComboBoxValue.jelly b/core/src/main/resources/lib/form/editableComboBoxValue.jelly
index 639c8070fa8bfc5c245313d1c8e80e946a5406bb..1468ff7138ae869e6983e9980c49843c75ccb2bb 100644
--- a/core/src/main/resources/lib/form/editableComboBoxValue.jelly
+++ b/core/src/main/resources/lib/form/editableComboBoxValue.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <st:documentation>
     Used inside &lt;f:editableComboBox/> to specify one value of a combobox.
diff --git a/core/src/main/resources/lib/form/enum.jelly b/core/src/main/resources/lib/form/enum.jelly
index a554ff72a92cf7d9add9aa4f9623cbae313a159e..6b949f397bc60e517c0d150fea57e82883a8f9f0 100644
--- a/core/src/main/resources/lib/form/enum.jelly
+++ b/core/src/main/resources/lib/form/enum.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Binds an enum field to a &lt;select> element.
diff --git a/core/src/main/resources/lib/form/expandableTextbox.jelly b/core/src/main/resources/lib/form/expandableTextbox.jelly
index 6568e09cb13b9159f2d72ecd0b61aabe45b05721..b33fa377df0adedf31c49129444078125628f947 100644
--- a/core/src/main/resources/lib/form/expandableTextbox.jelly
+++ b/core/src/main/resources/lib/form/expandableTextbox.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   TODO: support @checkUrl
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:f="/lib/form" xmlns:st="jelly:stapler">
   <st:documentation>
     single-line textbox that can be expanded into a multi-line textarea.
diff --git a/core/src/main/resources/lib/form/form.jelly b/core/src/main/resources/lib/form/form.jelly
index f59017dd51a8c9b2ce0f17966683d82e873a8c8f..567b44e91b638840fbcd41f3ece15984ae549a9e 100644
--- a/core/src/main/resources/lib/form/form.jelly
+++ b/core/src/main/resources/lib/form/form.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Outer-most tag of the entire form taglib, that generates &lt;form> element.
diff --git a/core/src/main/resources/lib/form/helpArea.jelly b/core/src/main/resources/lib/form/helpArea.jelly
index 142e1eb1ca960120e77d0dfb9ae411186f95a544..dc5f8839aec328f5dd5ba31514291d971c208f67 100644
--- a/core/src/main/resources/lib/form/helpArea.jelly
+++ b/core/src/main/resources/lib/form/helpArea.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Place holder to lazy-load help text via AJAX.
diff --git a/core/src/main/resources/lib/form/hetero-radio.jelly b/core/src/main/resources/lib/form/hetero-radio.jelly
index 1a768b961059ea1fd40db56de930d2c6a8c9924f..99bee7d4856e585d9bc2eecd79252faa15743974 100644
--- a/core/src/main/resources/lib/form/hetero-radio.jelly
+++ b/core/src/main/resources/lib/form/hetero-radio.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:local="local">
   <st:documentation>
     Sibling of hetero-list, which only allows the user to pick one type from the list of descriptors and configure it.
diff --git a/core/src/main/resources/lib/form/invisibleEntry.jelly b/core/src/main/resources/lib/form/invisibleEntry.jelly
index 053518e1e481b53f09dac1ee395a5ea7cf1a8e0e..9de583111fc1fd46e6d68d68c6c54e976d8d281e 100644
--- a/core/src/main/resources/lib/form/invisibleEntry.jelly
+++ b/core/src/main/resources/lib/form/invisibleEntry.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Invisible &lt;f:entry> type. Useful for adding hidden field values.
diff --git a/core/src/main/resources/lib/form/nested.jelly b/core/src/main/resources/lib/form/nested.jelly
index 3ed5af165925e3d01ba7d9c1d38a68041b8526c2..7e54a44e3ef4bdd1a042e9a2a964a7f19757b041 100644
--- a/core/src/main/resources/lib/form/nested.jelly
+++ b/core/src/main/resources/lib/form/nested.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used to display indented nested portion of the form
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<tr>
     <td colspan="2"/>
diff --git a/core/src/main/resources/lib/form/optionalBlock.jelly b/core/src/main/resources/lib/form/optionalBlock.jelly
index 9758add2a91063ca017c8d9f7e1e3b781f1a4c22..87ce8bbd3732fb010016e2150476cd3e84f878e0 100644
--- a/core/src/main/resources/lib/form/optionalBlock.jelly
+++ b/core/src/main/resources/lib/form/optionalBlock.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Foldable block that can be expanded to show more controls by checking the checkbox.
diff --git a/core/src/main/resources/lib/form/optionalProperty.jelly b/core/src/main/resources/lib/form/optionalProperty.jelly
index 82658a6c4f6b2548e2c2c52c6048948782c5477f..7b2827448a22d9bbff451b7dc053e1e1c3ae4770 100644
--- a/core/src/main/resources/lib/form/optionalProperty.jelly
+++ b/core/src/main/resources/lib/form/optionalProperty.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Renders inline an optional single-value nested data-bound property of the current instance,
diff --git a/core/src/main/resources/lib/form/password.jelly b/core/src/main/resources/lib/form/password.jelly
index b0f71fde187f5d378c586cb5e7765e4642c42cda..b9a9c2d2327ee314717c5f1750261be1a1f6e235 100644
--- a/core/src/main/resources/lib/form/password.jelly
+++ b/core/src/main/resources/lib/form/password.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
   <st:documentation>
     Glorified &lt;input type="password">
diff --git a/core/src/main/resources/lib/form/prepareDatabinding.jelly b/core/src/main/resources/lib/form/prepareDatabinding.jelly
index 8038d7a4626041dd1f158308cbbe5824d2895a76..8344768a0eb7838c49727cbb0dc5be382ade8172 100644
--- a/core/src/main/resources/lib/form/prepareDatabinding.jelly
+++ b/core/src/main/resources/lib/form/prepareDatabinding.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define">
   <st:documentation>
     Modifies the 'attrs.field' of the parent to inherit @field from the enclosing &lt;f:entry>
diff --git a/core/src/main/resources/lib/form/property.jelly b/core/src/main/resources/lib/form/property.jelly
index 10c9da5935bda86e297560fb17a7db88d79a9b3d..522452cc6e3d8695e41ed22a566a47583b218a5f 100644
--- a/core/src/main/resources/lib/form/property.jelly
+++ b/core/src/main/resources/lib/form/property.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Renders inline a single-value nested data-bound property of the current instance.
diff --git a/core/src/main/resources/lib/form/radio.jelly b/core/src/main/resources/lib/form/radio.jelly
index d3e96c55f513145f9954e7d841777c17fee6b0f5..73fb755862945fb0ae45c4ddea93e47137ef513c 100644
--- a/core/src/main/resources/lib/form/radio.jelly
+++ b/core/src/main/resources/lib/form/radio.jelly
@@ -23,9 +23,10 @@ THE SOFTWARE.
 -->
 
 <!--
-	<input type="radio"> tag that takes true/false for @checked.
+    <input type="radio"> tag that takes true/false for @checked.
 
 	Note that safari doesn't support onchange.
 -->
+<?jelly escape-by-default='true'?>
 <input type="radio" name="${attrs.name}" onclick="${attrs.onclick}" id="${attrs.id}" value="${attrs.value}"
-        checked="${attrs.checked?'true':null}"/>
\ No newline at end of file
+        checked="${attrs.checked?'true':null}"/>
diff --git a/core/src/main/resources/lib/form/readOnlyTextbox.jelly b/core/src/main/resources/lib/form/readOnlyTextbox.jelly
index 239745975fe4f60b27945d57f512c282046995bd..af6af7c7f76e86a2b60ec094e7e76cfc9908f4d3 100644
--- a/core/src/main/resources/lib/form/readOnlyTextbox.jelly
+++ b/core/src/main/resources/lib/form/readOnlyTextbox.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:f="/lib/form">
   <st:documentation>
     Generates an input field <tt>&lt;input type="text" ... /></tt> to be
diff --git a/core/src/main/resources/lib/form/repeatableDeleteButton.jelly b/core/src/main/resources/lib/form/repeatableDeleteButton.jelly
index e11b05f2b3b418997abd6815a6046ba8f759d0d3..a40d2c70b8982d3bbe51210022550f01922ca912 100644
--- a/core/src/main/resources/lib/form/repeatableDeleteButton.jelly
+++ b/core/src/main/resources/lib/form/repeatableDeleteButton.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Delete button for the &lt;repeatable> tag.
diff --git a/core/src/main/resources/lib/form/repeatableProperty.jelly b/core/src/main/resources/lib/form/repeatableProperty.jelly
index d10c3d8617c99b599a5e8a0d89a32f061a6788ec..3a36c94cdada60cd055efda83a0732b6b28b7f49 100644
--- a/core/src/main/resources/lib/form/repeatableProperty.jelly
+++ b/core/src/main/resources/lib/form/repeatableProperty.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation> <![CDATA[]
     Data-bound only version of <f:repeatable> that assumes the type pointed by the property is data-bound as well.
diff --git a/core/src/main/resources/lib/form/richtextarea.jelly b/core/src/main/resources/lib/form/richtextarea.jelly
index 694063b2986b0f8b4f3dd1c9dce4d58fbaabd6a6..7649ed5e88a01700d00c3611cdcf1cf964a9a713 100644
--- a/core/src/main/resources/lib/form/richtextarea.jelly
+++ b/core/src/main/resources/lib/form/richtextarea.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
   <st:documentation>
     Rich HTML editor from http://developer.yahoo.com/yui/editor/
diff --git a/core/src/main/resources/lib/form/rowSet.jelly b/core/src/main/resources/lib/form/rowSet.jelly
index 0f7b21b399913c37690a5ee2aeec558b494a9bff..19dd716b870f3364b78aa5f6226d03d8d8068abb 100644
--- a/core/src/main/resources/lib/form/rowSet.jelly
+++ b/core/src/main/resources/lib/form/rowSet.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Adds @nameRef to all table rows inside this tag, so that when the form is submitted,
diff --git a/core/src/main/resources/lib/form/submit.jelly b/core/src/main/resources/lib/form/submit.jelly
index 7ce870137e0386f435a5bbecfdf72b3f5fa7912b..fd11bc805a14856c5527a1605cd82d6624ce96e1 100644
--- a/core/src/main/resources/lib/form/submit.jelly
+++ b/core/src/main/resources/lib/form/submit.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:s="jelly:stapler" xmlns:d="jelly:define" xmlns:f="/lib/form">
   <s:documentation>
     Submit button themed by YUI. This should be always
diff --git a/core/src/main/resources/lib/form/textarea.jelly b/core/src/main/resources/lib/form/textarea.jelly
index edcf4e7c28ed11366a7f824f92bc7d2a8b17c48c..f987a27b009a71de38bc56cf7970e7c2a7fa09c9 100644
--- a/core/src/main/resources/lib/form/textarea.jelly
+++ b/core/src/main/resources/lib/form/textarea.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
   <st:documentation>
     &lt;textarea> tag on steroids.
diff --git a/core/src/main/resources/lib/form/withCustomDescriptorByName.jelly b/core/src/main/resources/lib/form/withCustomDescriptorByName.jelly
index 7e6d520dce7a4aaf3554763531e9bb622f2dcc56..7326222141ae2a0b061085526c7df3ed5c2c60cd 100644
--- a/core/src/main/resources/lib/form/withCustomDescriptorByName.jelly
+++ b/core/src/main/resources/lib/form/withCustomDescriptorByName.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:documentation>
     Execute the body with a temporary currentDescriptorByNameUrl value
diff --git a/core/src/main/resources/lib/hudson/actions.jelly b/core/src/main/resources/lib/hudson/actions.jelly
index 417ee493e6af9dfa7a96e35ffbf5d12e8228e714..9b585c22604c884319f2924710a1679a9faf12e7 100644
--- a/core/src/main/resources/lib/hudson/actions.jelly
+++ b/core/src/main/resources/lib/hudson/actions.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for the build view.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:forEach var="action" items="${it.actions}">
     <!-- allow the action to take over the rendering, but otherwise fall back to the default -->
diff --git a/core/src/main/resources/lib/hudson/ballColorTd.jelly b/core/src/main/resources/lib/hudson/ballColorTd.jelly
index 13dadeea1a085f86336fb4e170c994afc20965e4..85b5ae6cdc6ed5f439639aff8ae1175205733612 100644
--- a/core/src/main/resources/lib/hudson/ballColorTd.jelly
+++ b/core/src/main/resources/lib/hudson/ballColorTd.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Display the ball in a TD.
diff --git a/core/src/main/resources/lib/hudson/buildCaption.jelly b/core/src/main/resources/lib/hudson/buildCaption.jelly
index ee8e0c0ec35f92b76cf99ee8ece26ea11eb6b6a6..7ee0ddb0149e0a0f50af22c0dc0c7e4a72bf3dea 100644
--- a/core/src/main/resources/lib/hudson/buildCaption.jelly
+++ b/core/src/main/resources/lib/hudson/buildCaption.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
     displays a caption for build/externalRun.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<h1>
 	  <j:if test="${it.building}">
diff --git a/core/src/main/resources/lib/hudson/buildProgressBar.jelly b/core/src/main/resources/lib/hudson/buildProgressBar.jelly
index 6f1f53247afc4071ce8c197f8cf592bb0be79136..c61fa66c0cf8f5a459dacfdf7a5b4b8667280511 100644
--- a/core/src/main/resources/lib/hudson/buildProgressBar.jelly
+++ b/core/src/main/resources/lib/hudson/buildProgressBar.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Progress bar for a build in progress.
diff --git a/core/src/main/resources/lib/hudson/buildRangeLink.jelly b/core/src/main/resources/lib/hudson/buildRangeLink.jelly
index 6e992f97c51a4b9cb5ec5f0d455a1359ab6a6a7e..c4ef5fe331d81e619dc373258df54acb52a33d93 100644
--- a/core/src/main/resources/lib/hudson/buildRangeLink.jelly
+++ b/core/src/main/resources/lib/hudson/buildRangeLink.jelly
@@ -29,6 +29,7 @@ THE SOFTWARE.
 	<%@ attribute name="job" type="hudson.model.Job" required="true" %>
 -->
 <!-- it's hudson.model.Fingerprint.RangeSet but Tomcat can't seem to handler inner classes -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<j:forEach var="r" items="${range.ranges}">
 	  <j:choose>
diff --git a/core/src/main/resources/lib/hudson/editTypeIcon.jelly b/core/src/main/resources/lib/hudson/editTypeIcon.jelly
index f4f0daf64089ce85c2adf737a2b16ab911be2910..0b80ca11c3baa7cd658f708ea9929352f0193380 100644
--- a/core/src/main/resources/lib/hudson/editTypeIcon.jelly
+++ b/core/src/main/resources/lib/hudson/editTypeIcon.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
   Displays the edit type icon.
 	<%@ attribute name="type" type="hudson.scm.EditType" required="true" %>
 -->
+<?jelly escape-by-default='true'?>
 <img width="16" height="16"
   src="${imagesURL}/16x16/document_${type.name}.gif"
   title="${type.description}" alt="${type.description}" />
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/editableDescription.jelly b/core/src/main/resources/lib/hudson/editableDescription.jelly
index ce33ed5c21545a87586c968948cb7a451718f899..d132e4df4bb77e88cf5c9990d27a361abdb8f9d6 100644
--- a/core/src/main/resources/lib/hudson/editableDescription.jelly
+++ b/core/src/main/resources/lib/hudson/editableDescription.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Renders ${it.description} and then allow it to be editable in place,
diff --git a/core/src/main/resources/lib/hudson/help.jelly b/core/src/main/resources/lib/hudson/help.jelly
index cfd90012ecab8f538accbe069e275d9b88a9a94e..87189b32a00697327517320a7d9823456e9076bb 100644
--- a/core/src/main/resources/lib/hudson/help.jelly
+++ b/core/src/main/resources/lib/hudson/help.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   (?) icon linked to the specified @href
 -->
+<?jelly escape-by-default='true'?>
 <a href="${href}">
   <img src="${imagesURL}/16x16/help.gif" alt="[help]" height="16" width="16"/>
 </a>
diff --git a/core/src/main/resources/lib/hudson/listScmBrowsers.jelly b/core/src/main/resources/lib/hudson/listScmBrowsers.jelly
index 6d6c337b4b30b705beff3c33ad50673b4ddd6ed8..b655da6d59c657105a1f0a3bda725698f3146313 100644
--- a/core/src/main/resources/lib/hudson/listScmBrowsers.jelly
+++ b/core/src/main/resources/lib/hudson/listScmBrowsers.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     List browser SCMs
diff --git a/core/src/main/resources/lib/hudson/progressBar.jelly b/core/src/main/resources/lib/hudson/progressBar.jelly
index 66c129ee5127e90723cb9a86f20d56d0836b469d..2aa585cc6cd80a31d67e66720d8ca9f5d465db6a 100644
--- a/core/src/main/resources/lib/hudson/progressBar.jelly
+++ b/core/src/main/resources/lib/hudson/progressBar.jelly
@@ -30,6 +30,7 @@ THE SOFTWARE.
     href : if set, the progress bar becomes a hyperlink
     red  : if set to non-null, the progress bar will be drawn in red, to indicate that the processing is likely stuck.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <table class="progress-bar ${attrs.red?'red':null}" id="${attrs.id}" tooltip="${attrs.tooltip}" href="${attrs.href}" style="${attrs.href!=null ? 'cursor:pointer' : null}">
     <j:choose>
diff --git a/core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding.jelly b/core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding.jelly
index 04400e5cd99bc4f4faf708c78f96fa31b89903dc..2b0c94a3139d267714fc86acd7b54957fe4f88cc 100644
--- a/core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-blockWhenDownstreamBuilding.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- Block build when downstream dependency is building -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:optionalBlock name="blockBuildWhenDownstreamBuilding"
 		   title="${%Block build when downstream project is building}"
diff --git a/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding.jelly b/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding.jelly
index 69794835a263edd6e816b44240514e4128052512..ad1b1f1d1c3453cf14e6c256710e0270531b99dd 100644
--- a/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- Block build when upstream dependency is building -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:optionalBlock name="blockBuildWhenUpstreamBuilding"
 		   title="${%Block build when upstream project is building}"
diff --git a/core/src/main/resources/lib/hudson/project/config-buildWrappers.jelly b/core/src/main/resources/lib/hudson/project/config-buildWrappers.jelly
index 9a9d964f754f7861f30ebcb0b5249d4fb788cdb6..e6d0af9c19094585d7fcdaa73e7ce1892db780e7 100644
--- a/core/src/main/resources/lib/hudson/project/config-buildWrappers.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-buildWrappers.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Build wrapper config pane
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
   <j:set var="wrappers" value="${h.getBuildWrapperDescriptors(it)}" />
   <j:if test="${!empty(wrappers)}">
diff --git a/core/src/main/resources/lib/hudson/project/config-builders.jelly b/core/src/main/resources/lib/hudson/project/config-builders.jelly
index ddbe86ae64f9b26226cb305066256cae56b56d60..1501bae7633c9f998ffc46eb4a4206e4cec9f07b 100644
--- a/core/src/main/resources/lib/hudson/project/config-builders.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-builders.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Builder config pane
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
   <!-- build config pane -->
   <!--f:descriptorList title="${%Build}"
diff --git a/core/src/main/resources/lib/hudson/project/config-customWorkspace.jelly b/core/src/main/resources/lib/hudson/project/config-customWorkspace.jelly
index cd2be7ccff83211d371a92d2bcbccbf89a6e6c89..e60a9d83e75002dee2885ce14b50f8da774f7e23 100644
--- a/core/src/main/resources/lib/hudson/project/config-customWorkspace.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-customWorkspace.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- custom workspace -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <f:optionalBlock name="customWorkspace" title="${%Use custom workspace}" checked="${it.customWorkspace!=null}" help="/help/project-config/custom-workspace.html">
     <f:entry title="${%Directory}">
diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild.jelly b/core/src/main/resources/lib/hudson/project/config-disableBuild.jelly
index 1d65da82ead9b17a460bfb6504e88ad0f9932646..ac8347d7320d7179fe8665b097439bc72e1d607c 100644
--- a/core/src/main/resources/lib/hudson/project/config-disableBuild.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-disableBuild.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Configuration entry for disabling builds
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:optionalBlock name="disable" title="${%Disable Build} (${%No new builds will be executed until the project is re-enabled.})" checked="${it.disabled}"
                    help="/help/project-config/disable.html" />
diff --git a/core/src/main/resources/lib/hudson/project/config-publishers.jelly b/core/src/main/resources/lib/hudson/project/config-publishers.jelly
index 72ea416cd7afb21376bef29efb35bd016e350abe..ddbf60fc6411403f6c613b9d4d7353ca59b15eba 100644
--- a/core/src/main/resources/lib/hudson/project/config-publishers.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-publishers.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Publisher config pane
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
   <f:descriptorList title="${%Post-build Actions}"
                     descriptors="${h.getPublisherDescriptors(it)}"
diff --git a/core/src/main/resources/lib/hudson/project/config-quietPeriod.jelly b/core/src/main/resources/lib/hudson/project/config-quietPeriod.jelly
index 8bfe02bdbec7ddbb95e5e1b41aaeee0d23d116ed..91084797d791985ce036256fb8b50706b585a7ab 100644
--- a/core/src/main/resources/lib/hudson/project/config-quietPeriod.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-quietPeriod.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- custom quiet period -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:optionalBlock name="hasCustomQuietPeriod" title="${%Quiet period}" checked="${it.hasCustomQuietPeriod}"
       help="/help/project-config/quietPeriod.html">
diff --git a/core/src/main/resources/lib/hudson/project/config-retryCount.jelly b/core/src/main/resources/lib/hudson/project/config-retryCount.jelly
index 0125f7d33e9544c70c13b527093b172883cdd738..76ef13ae74d70f037bbf19a89c8e85b8b292e777 100644
--- a/core/src/main/resources/lib/hudson/project/config-retryCount.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-retryCount.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- custom retry count -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:optionalBlock name="hasCustomScmCheckoutRetryCount" title="${%Retry Count}" checked="${it.hasCustomScmCheckoutRetryCount()}"
       help="/help/project-config/scmCheckoutRetryCount.html">
diff --git a/core/src/main/resources/lib/hudson/project/config-scm.jelly b/core/src/main/resources/lib/hudson/project/config-scm.jelly
index 96da9376860718c8de4629d4836892bbc64a1fc9..49f7b2c9bf1be331a625c589e92b4dc7480b3b34 100644
--- a/core/src/main/resources/lib/hudson/project/config-scm.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-scm.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- SCM config pane -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:section title="${%Source Code Management}">
     <j:set var="scms" value="${h.getSCMDescriptors(it)}" />
diff --git a/core/src/main/resources/lib/hudson/project/config-trigger.jelly b/core/src/main/resources/lib/hudson/project/config-trigger.jelly
index 285b9490fe326ba1db4485a4be8dfa7fe0c06e4d..5da3902382510159357985f49e04c8467e48f26e 100644
--- a/core/src/main/resources/lib/hudson/project/config-trigger.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-trigger.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Configure build triggers
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <!-- build triggers config pane -->
   <j:invokeStatic var="triggers" className="hudson.triggers.Trigger" method="for_">
diff --git a/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger.jelly b/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger.jelly
index 557fc9593101b6404b1b53297cbf0921c87447fe..1859423743267c565ff450da15fbc6a02c88bccf 100644
--- a/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger.jelly
@@ -27,6 +27,7 @@ THE SOFTWARE.
 
   "it" is assumed to be a Project object.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <!-- pseudo-trigger to list upstream projects. -->
   <j:set var="up" value="${it.buildTriggerUpstreamProjects}" />
diff --git a/core/src/main/resources/lib/hudson/project/projectActionFloatingBox.jelly b/core/src/main/resources/lib/hudson/project/projectActionFloatingBox.jelly
index b8ea52938108bdc2556eb3ba9e6903a69bec371b..82091853fc04630f2b9ecf81efdedc765bcba464 100644
--- a/core/src/main/resources/lib/hudson/project/projectActionFloatingBox.jelly
+++ b/core/src/main/resources/lib/hudson/project/projectActionFloatingBox.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used in the index page to show floating boxes contributed from project actions.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div style="float:right">
     <j:forEach var="a" items="${it.actions}">
diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly
index c34f69d485f9888b2f9fd0325433c514302fd055..b075ded2dd5d9e56d532da922410a43396b2aad9 100644
--- a/core/src/main/resources/lib/hudson/projectView.jelly
+++ b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
diff --git a/core/src/main/resources/lib/hudson/projectViewRow.jelly b/core/src/main/resources/lib/hudson/projectViewRow.jelly
index fceb533a6b57ed4a8a830ed25727fff2b5c61c3c..e9e85179e8636aa7ae971133daff611b1c07afda 100644
--- a/core/src/main/resources/lib/hudson/projectViewRow.jelly
+++ b/core/src/main/resources/lib/hudson/projectViewRow.jelly
@@ -28,6 +28,7 @@ THE SOFTWARE.
     @job : job to draw
     @indenter
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <tr class="${job.disabled?'disabledJob':null}">
     <j:forEach var="col" items="${columnExtensions}">
diff --git a/core/src/main/resources/lib/hudson/propertyTable.jelly b/core/src/main/resources/lib/hudson/propertyTable.jelly
index b0ca7d8d028dcccd99bc3be84c5bb51012a124e5..1a558381061887de69b71ce51f7757a9d172fed4 100644
--- a/core/src/main/resources/lib/hudson/propertyTable.jelly
+++ b/core/src/main/resources/lib/hudson/propertyTable.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Dispaly sortable table of properties.
diff --git a/core/src/main/resources/lib/hudson/rssBar-with-iconSize.jelly b/core/src/main/resources/lib/hudson/rssBar-with-iconSize.jelly
index 1bf647316dd33434d162173ebe6b22bd934b5ea7..2dad830e0d299429ceb72623e79d6340ee4bff1d 100644
--- a/core/src/main/resources/lib/hudson/rssBar-with-iconSize.jelly
+++ b/core/src/main/resources/lib/hudson/rssBar-with-iconSize.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- Deprecated since 1.345: use <t:iconSize><t:rssBar/></t:iconSize> -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
   <t:iconSize><t:rssBar/></t:iconSize>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/rssBar.jelly b/core/src/main/resources/lib/hudson/rssBar.jelly
index e08422aef6530c6810d287262e5e18ea9e4edaf9..6f352feaa064c68ad36ae12468981bb42feb9a0b 100644
--- a/core/src/main/resources/lib/hudson/rssBar.jelly
+++ b/core/src/main/resources/lib/hudson/rssBar.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div align="right" style="margin:1em">
     <a href="${rootURL}/legend">${%Legend}</a>
diff --git a/core/src/main/resources/lib/hudson/setIconSize.jelly b/core/src/main/resources/lib/hudson/setIconSize.jelly
index 427c1f9fbc1e26ba217cd40916826ceec545b8a7..138c220ae042a14ca12f6411ad4aafabca35cb11 100644
--- a/core/src/main/resources/lib/hudson/setIconSize.jelly
+++ b/core/src/main/resources/lib/hudson/setIconSize.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   read icon size from a cookie and set it up
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:set scope="parent" var="iconSize" value="${h.getCookie(request,'iconSize','32x32')}" />
   <!--
diff --git a/core/src/main/resources/lib/hudson/summary.jelly b/core/src/main/resources/lib/hudson/summary.jelly
index eecf88189caef5bbcea169e58e1ef2399aa74f63..2b29118941c61b591d5043166977f24d1facf5b8 100644
--- a/core/src/main/resources/lib/hudson/summary.jelly
+++ b/core/src/main/resources/lib/hudson/summary.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Displays a link with a large icon. Used in the project top page.
diff --git a/core/src/main/resources/lib/layout/ajax.jelly b/core/src/main/resources/lib/layout/ajax.jelly
index 1570dbe2baa8c132608e7183924483e79507585f..c0c1e8d7bb227db167f4329980e7e436808fd69e 100644
--- a/core/src/main/resources/lib/layout/ajax.jelly
+++ b/core/src/main/resources/lib/layout/ajax.jelly
@@ -32,6 +32,7 @@ THE SOFTWARE.
 
   See MatrixProject/index.jelly and ajaxMatrix.jelly for how to use this tag.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form" xmlns:p="/lib/hudson/project">
   <j:choose>
     <j:when test="${rootURL!=null}">
diff --git a/core/src/main/resources/lib/layout/expandButton.jelly b/core/src/main/resources/lib/layout/expandButton.jelly
index e0f972c87cc83bc09110051565c24be359094fd9..d80e1355bf528e1065b70948d6618e5ea834504f 100644
--- a/core/src/main/resources/lib/layout/expandButton.jelly
+++ b/core/src/main/resources/lib/layout/expandButton.jelly
@@ -30,6 +30,7 @@ THE SOFTWARE.
   Attributes:
   @title :   title of the button. required.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <div class="advancedLink">
     <input type="button" value="${attrs.title}" class="expandButton" />
diff --git a/core/src/main/resources/lib/layout/hasPermission.jelly b/core/src/main/resources/lib/layout/hasPermission.jelly
index 3c89d6d83e6ada6e553c3e77f63ba2e2f760ddec..d42a5f96891822fca9e2a7440d0c4f87bc853ab8 100644
--- a/core/src/main/resources/lib/layout/hasPermission.jelly
+++ b/core/src/main/resources/lib/layout/hasPermission.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler">
   <st:documentation>
     Renders the body only if the current user has the specified permission
diff --git a/core/src/main/resources/lib/layout/header.jelly b/core/src/main/resources/lib/layout/header.jelly
index 53f2667da525a3d32a0ab60c9c0b86d3a35c909a..ed9837cf160f9c338824723f3efce02c4e9b3642 100644
--- a/core/src/main/resources/lib/layout/header.jelly
+++ b/core/src/main/resources/lib/layout/header.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:s="jelly:stapler" xmlns:d="jelly:define">
   <s:documentation>
     Header portion of the HTML page, that gets rendered into the &lt;head> tag.
diff --git a/core/src/main/resources/lib/layout/isAdmin.jelly b/core/src/main/resources/lib/layout/isAdmin.jelly
index 098185e0b19615604cbbf5e1a0094e10bd72c519..cbd5493c9963d723c0a104d0934f98050576a26d 100644
--- a/core/src/main/resources/lib/layout/isAdmin.jelly
+++ b/core/src/main/resources/lib/layout/isAdmin.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:s="jelly:stapler">
   <j:if test="${h.hasPermission(app.ADMINISTER)}">
     <d:invokeBody />
diff --git a/core/src/main/resources/lib/layout/isAdminOrTest.jelly b/core/src/main/resources/lib/layout/isAdminOrTest.jelly
index 481d9a8dbeaa055123dd7512648fafaae525b573..7587229c000879e956be02620c69e7e699a49e28 100644
--- a/core/src/main/resources/lib/layout/isAdminOrTest.jelly
+++ b/core/src/main/resources/lib/layout/isAdminOrTest.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
 <%@ attribute name="test" required="true" type="java.lang.Boolean" %>
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:s="jelly:stapler">
     <j:choose>
         <j:when test="${!test &amp;&amp; app.useSecurity}">
diff --git a/core/src/main/resources/lib/layout/main-panel.jelly b/core/src/main/resources/lib/layout/main-panel.jelly
index 84ef9f5238d05537b95ef074a16995506cd51f04..92e2e12d28d7024ea3128fd9a11a3002ec495b87 100644
--- a/core/src/main/resources/lib/layout/main-panel.jelly
+++ b/core/src/main/resources/lib/layout/main-panel.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define">
   <st:documentation>
     Generates the body as the main content part of a Jenkins page.
diff --git a/core/src/main/resources/lib/layout/rightspace.jelly b/core/src/main/resources/lib/layout/rightspace.jelly
index 7270af404262672c57fbc5be92a623927513eae8..31bd6b41f0af8c051d6c30c46e3ab65819553fba 100644
--- a/core/src/main/resources/lib/layout/rightspace.jelly
+++ b/core/src/main/resources/lib/layout/rightspace.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler">
   <st:documentation>
     Creates a space for the right-hand side of the page.
diff --git a/core/src/main/resources/lib/layout/side-panel.jelly b/core/src/main/resources/lib/layout/side-panel.jelly
index 50378542242a5795d068fcc65c3222781a360128..fd203550fe22c4bd03b0821c8e12b7bf9b434089 100644
--- a/core/src/main/resources/lib/layout/side-panel.jelly
+++ b/core/src/main/resources/lib/layout/side-panel.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:s="jelly:stapler" xmlns:d="jelly:define">
   <j:if test="${mode=='side-panel'}">
     <d:invokeBody />
diff --git a/core/src/main/resources/lib/layout/tabBar.jelly b/core/src/main/resources/lib/layout/tabBar.jelly
index ea1d0ab9b222a5b273f32cc1cab5c4f90567dcac..b4f4e252845f819948bf96c0454bca53b223fad1 100644
--- a/core/src/main/resources/lib/layout/tabBar.jelly
+++ b/core/src/main/resources/lib/layout/tabBar.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler">
   <table cellpadding="0" cellspacing="0" id="viewList">
     <j:set var="tab" value="${tabs}" />
diff --git a/core/src/main/resources/lib/layout/tasks.jelly b/core/src/main/resources/lib/layout/tasks.jelly
index 4cc04985a83c6fc71c518847c450ea3364ce60c6..9b6e4b469bb6dc821fb29ab2575cc62c7ccd8a1d 100644
--- a/core/src/main/resources/lib/layout/tasks.jelly
+++ b/core/src/main/resources/lib/layout/tasks.jelly
@@ -32,6 +32,7 @@ THE SOFTWARE.
       ...
     </l:tasks>
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define">
 	<div id="tasks">
 	  <d:invokeBody />
diff --git a/core/src/main/resources/lib/layout/yui.jelly b/core/src/main/resources/lib/layout/yui.jelly
index 08519595f3ea17f24b95faa0ebaa3c0eae18b201..5b3853ec0741333110a9ed41aba52e03b3c55025 100644
--- a/core/src/main/resources/lib/layout/yui.jelly
+++ b/core/src/main/resources/lib/layout/yui.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <st:documentation>
     Load Yahoo UI module.
diff --git a/maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/digest.jelly b/maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/digest.jelly
index 8fde3d6b60675157af4528b93f3c2733bb2d8db0..66718279d7b5132d230bd31c9e43b775eee43ee6 100644
--- a/maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/digest.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/digest.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <st:include from="${it.core}" page="digest.jelly" />
 </j:jelly>
\ No newline at end of file
diff --git a/maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/index.jelly b/maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/index.jelly
index 9e0d2fcf1e3eccc5da99518f1becf87c7c73959d..13e473eb30c045c9ef1fd1f2c4cbe8965ba99205 100644
--- a/maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/index.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/FilteredChangeLogSet/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <st:include from="${it.core}" page="index.jelly" />
 </j:jelly>
\ No newline at end of file
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions.jelly
index 137a878a95afa9999e6e71612cded08c03b8bd08..9462d2c8caf38b912e90a3e607a8938e7c70edfc 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/actions.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:task icon="images/24x24/gear.gif" href="${buildUrl.baseUrl}/executedMojos" title="${%Executed Mojos}" />
   <!-- include super class definition -->
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries.jelly
index 75f8a503b3f883cf910d247f1ccf4ab555e9202c..4850bcf1e770f5a6be7c9f2a4aa064c2e5f7d4a4 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModule/configure-entries.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
   <p:config-trigger />
 
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions.jelly
index fe98be2e4448391c26103e0c4aac5ae3dcd62cc4..51b2e2ba7ced4d27fbc9126dd106ea397648348f 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:if test="${it.hasDisabledModule()}">
     <l:isAdmin>
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/ajaxBuildQueue.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/ajaxBuildQueue.jelly
index 73731b8c0308acb3b9b52b93cf2b1f2348177e4a..c8eccf4f4a353ff78e00ced851f791af124fe9c3 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/ajaxBuildQueue.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/ajaxBuildQueue.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used to asynchronously update build queue
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:ajax>
     <t:queue items="${it.queueItems}" />
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules.jelly
index 93dc19901d929030b91ae934ef3046168a454b8c..de6d11a81e67b716abbac7d47836c3a3af1309eb 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/deleteAllDisabledModules.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Delete all disabled modules.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout>
 		<st:include page="sidepanel.jelly" />
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/global.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/global.jelly
index 445038daf7a907ae742e9ce9569a80f54bee3681..8dcf7a5bb465996eea4ece70e53144b9f20421c0 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/global.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/global.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:section title="${%Maven Project Configuration}">
     <f:entry title="${%Global MAVEN_OPTS}" help="/plugin/maven-plugin/maven-opts.html">
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/help-goals.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/help-goals.jelly
index 53398c4062f05340e55ce1c51470423ab6210dfe..893c69ff8a56a3354fac31eb8cf4dbd7449d9cc2 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/help-goals.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/help-goals.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:ajax>
     <div>
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.jelly
index 489155118e03e506d52edabdbff76dfe7bd10867..583f693ef4b8404f29909eb5f8c8062382d73114 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/newJobDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <div>
   ${%body}
 </div>
\ No newline at end of file
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/sidepanel2.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/sidepanel2.jelly
index e7d1ecdf5165a12729d0636cf41d7faaf9ec1afc..49417280f0f60b12374f1fbbd1dbe86cd4066075 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/sidepanel2.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/sidepanel2.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:if test="${!it.isAggregatorStyleBuild()}">
     <!--
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/_script.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/_script.jelly
index 9f20a7b1075b81c079d6ad211d76a8dff32b013b..0aad7adba35b282910f0effcf783923bd0e1b74a 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/_script.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/_script.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Called from doScript() to display the execution result and the form.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <t:scriptConsole>
     <pre>println System.getenv("PATH")</pre>
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars.jelly
index d96643c02cbf5794559d894c2a4eac6ab96267a0..585b20a52f055838fc5c28bcdfe0e14e5f2cc220 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:test="/lib/test">
   <l:layout permission="${app.ADMINISTER}" title="${%Environment Variables} - Maven Process for ${it.owner}">
     <st:include page="sidepanel.jelly" />
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index.jelly
index 03cd50b32d44e534c63c3847d4f41c7935b02b7e..e1c8845d4f0786051aa279488be437da65826df3 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:test="/lib/test">
   <l:layout title="Maven Process for ${it.owner}">
     <st:include page="sidepanel.jelly" />
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel.jelly
index deab3dac01858ca21dfad8d30f386bf5eef598c4..2b38fb7e93bdb6c36776a7682fd66de647588c01 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/sidepanel.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:side-panel>
     <l:tasks>
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties.jelly
index 33658211613dbe0ceb8648d52b8acbf5ce1d542f..5de74daf1f48f0c4760ee86eca2c79312917fc9e 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/systemProperties.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:test="/lib/test">
   <l:layout permission="${app.ADMINISTER}" title="${%System Properties} - Maven Process for ${it.owner}">
     <st:include page="sidepanel.jelly" />
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenTestDataPublisher/config.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenTestDataPublisher/config.jelly
index d264a1cd76c5548ff65f9d05e38483383956ec85..752656f078d064291111d36154a8bce1bc19bfba 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenTestDataPublisher/config.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenTestDataPublisher/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
          xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:invokeStatic var="testDataPublisherDescriptors"
diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly
index a934c4bec59ba52640c9205d252c3455a529f008..d3cd0bb9bf27ee9c3aaeb64c13eeb729abfb9a30 100644
--- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%Repository URL}" field="url">
     <f:textbox />
diff --git a/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge.jelly b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge.jelly
index 44f3b1976f119b5162205d0d696caa51173d56ff..4be30c9b76a44dd6c7b18cb12b0d0f612460cf80 100644
--- a/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:test="/lib/test">
   <j:if test="${it.hasBadge()}">
     <a href="${link}redeploy/">
diff --git a/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index.jelly b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index.jelly
index 1574a4fcc6b8aeb814c95c4b49432a05b2d66997..05de33efa472696fd1c8cb7669ff250e8b4bd8b7 100644
--- a/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:test="/lib/test">
   <l:layout permission="${it.REDEPLOY}">
     <st:include it="${it.parent}" page="sidepanel.jelly" />
diff --git a/test/src/main/resources/org/jvnet/hudson/test/CaptureEnvironmentBuilder/config.jelly b/test/src/main/resources/org/jvnet/hudson/test/CaptureEnvironmentBuilder/config.jelly
index 31b61f2adaff63547c23845fd1e53fb916d1d985..9d137d24a0b893d9610c894370a04e80f25eaed2 100644
--- a/test/src/main/resources/org/jvnet/hudson/test/CaptureEnvironmentBuilder/config.jelly
+++ b/test/src/main/resources/org/jvnet/hudson/test/CaptureEnvironmentBuilder/config.jelly
@@ -22,4 +22,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" />
\ No newline at end of file
diff --git a/test/src/main/resources/org/jvnet/hudson/test/ComputerConnectorTester/configure.jelly b/test/src/main/resources/org/jvnet/hudson/test/ComputerConnectorTester/configure.jelly
index 60f792c7946cf0a9483d9df7bb305383675fd168..e1fca7beae878c13524cf82d5e4c30a9b12c45a0 100644
--- a/test/src/main/resources/org/jvnet/hudson/test/ComputerConnectorTester/configure.jelly
+++ b/test/src/main/resources/org/jvnet/hudson/test/ComputerConnectorTester/configure.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout norefresh="true" title="Configuration">
diff --git a/test/src/main/resources/org/jvnet/hudson/test/FailureBuilder/config.jelly b/test/src/main/resources/org/jvnet/hudson/test/FailureBuilder/config.jelly
index 31b61f2adaff63547c23845fd1e53fb916d1d985..9d137d24a0b893d9610c894370a04e80f25eaed2 100644
--- a/test/src/main/resources/org/jvnet/hudson/test/FailureBuilder/config.jelly
+++ b/test/src/main/resources/org/jvnet/hudson/test/FailureBuilder/config.jelly
@@ -22,4 +22,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" />
\ No newline at end of file
diff --git a/test/src/main/resources/org/jvnet/hudson/test/MockBuilder/config.jelly b/test/src/main/resources/org/jvnet/hudson/test/MockBuilder/config.jelly
index f9672c42ff91817e393d8043bfd01be4e345a7ce..da48922baba00ae69e1a33c52718cb548df1d4de 100644
--- a/test/src/main/resources/org/jvnet/hudson/test/MockBuilder/config.jelly
+++ b/test/src/main/resources/org/jvnet/hudson/test/MockBuilder/config.jelly
@@ -22,4 +22,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" />
\ No newline at end of file
diff --git a/test/src/main/resources/org/jvnet/hudson/test/SleepBuilder/config.jelly b/test/src/main/resources/org/jvnet/hudson/test/SleepBuilder/config.jelly
index 31b61f2adaff63547c23845fd1e53fb916d1d985..9d137d24a0b893d9610c894370a04e80f25eaed2 100644
--- a/test/src/main/resources/org/jvnet/hudson/test/SleepBuilder/config.jelly
+++ b/test/src/main/resources/org/jvnet/hudson/test/SleepBuilder/config.jelly
@@ -22,4 +22,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" />
\ No newline at end of file
diff --git a/test/src/main/resources/org/jvnet/hudson/test/UnstableBuilder/config.jelly b/test/src/main/resources/org/jvnet/hudson/test/UnstableBuilder/config.jelly
index 31b61f2adaff63547c23845fd1e53fb916d1d985..9d137d24a0b893d9610c894370a04e80f25eaed2 100644
--- a/test/src/main/resources/org/jvnet/hudson/test/UnstableBuilder/config.jelly
+++ b/test/src/main/resources/org/jvnet/hudson/test/UnstableBuilder/config.jelly
@@ -22,4 +22,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" />
\ No newline at end of file
diff --git a/test/src/test/resources/hudson/ExceptionTest/ajaxError.jelly b/test/src/test/resources/hudson/ExceptionTest/ajaxError.jelly
index 5d3ee52ac1b523bc52e8d80915034e4c4391ca76..e6e48d02e1dd92b0e80d9af547e3cc4d02ba7199 100644
--- a/test/src/test/resources/hudson/ExceptionTest/ajaxError.jelly
+++ b/test/src/test/resources/hudson/ExceptionTest/ajaxError.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Entrance to the configuration page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
 <l:layout title="Nodes">
   <l:main-panel>
diff --git a/test/src/test/resources/hudson/markup/MarkupFormatterTest/DummyMarkupImpl/config.jelly b/test/src/test/resources/hudson/markup/MarkupFormatterTest/DummyMarkupImpl/config.jelly
index a2b973736024767c7c68934e5145901d82cf6471..00b67dc2c48513b3aaac9d3bbe2d55e07de642d7 100644
--- a/test/src/test/resources/hudson/markup/MarkupFormatterTest/DummyMarkupImpl/config.jelly
+++ b/test/src/test/resources/hudson/markup/MarkupFormatterTest/DummyMarkupImpl/config.jelly
@@ -1,4 +1,5 @@
 <!-- no config -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry field="prefix" title="${%Prefix}">
     <f:textbox/>
diff --git a/test/src/test/resources/hudson/model/JobPropertyTest/JobPropertyWithConfigImpl/config.jelly b/test/src/test/resources/hudson/model/JobPropertyTest/JobPropertyWithConfigImpl/config.jelly
index 8dc663c544e1160797d2dc9591cc5b1d9c006dba..541bf9f4a4fac5f87708d2a83298cfe7b277f334 100644
--- a/test/src/test/resources/hudson/model/JobPropertyTest/JobPropertyWithConfigImpl/config.jelly
+++ b/test/src/test/resources/hudson/model/JobPropertyTest/JobPropertyWithConfigImpl/config.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry field="name" title="${%Name}">
     <f:textbox/>
diff --git a/test/src/test/resources/hudson/model/UserPropertyTest/UserProperty1/config.jelly b/test/src/test/resources/hudson/model/UserPropertyTest/UserProperty1/config.jelly
index b5425226ee95892220fe5a3eccfbbdaf5d0ff64a..8a6ad168980e1ac04e1d93f294e71cd8e9986b88 100644
--- a/test/src/test/resources/hudson/model/UserPropertyTest/UserProperty1/config.jelly
+++ b/test/src/test/resources/hudson/model/UserPropertyTest/UserProperty1/config.jelly
@@ -1 +1,2 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core"/>
\ No newline at end of file
diff --git a/test/src/test/resources/hudson/model/UserPropertyTest/UserProperty2/config.jelly b/test/src/test/resources/hudson/model/UserPropertyTest/UserProperty2/config.jelly
index b5425226ee95892220fe5a3eccfbbdaf5d0ff64a..8a6ad168980e1ac04e1d93f294e71cd8e9986b88 100644
--- a/test/src/test/resources/hudson/model/UserPropertyTest/UserProperty2/config.jelly
+++ b/test/src/test/resources/hudson/model/UserPropertyTest/UserProperty2/config.jelly
@@ -1 +1,2 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core"/>
\ No newline at end of file
diff --git a/test/src/test/resources/hudson/model/ViewPropertyTest/ViewPropertyImpl/config.jelly b/test/src/test/resources/hudson/model/ViewPropertyTest/ViewPropertyImpl/config.jelly
index 777a376b647834004cd2c335df233c582e464712..8dd990e31ff5225fcdc2ddbd6c739b8b082b79de 100644
--- a/test/src/test/resources/hudson/model/ViewPropertyTest/ViewPropertyImpl/config.jelly
+++ b/test/src/test/resources/hudson/model/ViewPropertyTest/ViewPropertyImpl/config.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry field="name" title="${%Name}">
     <f:textbox default="Duke"/>
diff --git a/test/src/test/resources/hudson/model/labels/LabelAtomPropertyTest/LabelAtomPropertyImpl/config.jelly b/test/src/test/resources/hudson/model/labels/LabelAtomPropertyTest/LabelAtomPropertyImpl/config.jelly
index 31ed4fa4cbf200babe3fe39d06bf2bf9949b2c06..e883227bd0bcd217fa78c3c3a18a7e2a3a6022c8 100644
--- a/test/src/test/resources/hudson/model/labels/LabelAtomPropertyTest/LabelAtomPropertyImpl/config.jelly
+++ b/test/src/test/resources/hudson/model/labels/LabelAtomPropertyTest/LabelAtomPropertyImpl/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry field="abc">
     <f:textbox />
diff --git a/test/src/test/resources/hudson/pages/SystemConfigurationTestCase/PageDecoratorImpl/global.jelly b/test/src/test/resources/hudson/pages/SystemConfigurationTestCase/PageDecoratorImpl/global.jelly
index c04187d5f6beeb9589dbf5fd2194440badef636a..96134fbcd2b0f34a4e45067dfad93a26f182dda4 100644
--- a/test/src/test/resources/hudson/pages/SystemConfigurationTestCase/PageDecoratorImpl/global.jelly
+++ b/test/src/test/resources/hudson/pages/SystemConfigurationTestCase/PageDecoratorImpl/global.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:section title="PageDecorator">
     <f:entry title="PageDecoratorId">
diff --git a/test/src/test/resources/hudson/slaves/NodePropertyTest/PropertyImpl/config.jelly b/test/src/test/resources/hudson/slaves/NodePropertyTest/PropertyImpl/config.jelly
index 4bcbab93c41bf2e7e4bf4e0d9f24cba2bb732c13..ca9101f2910a1b96ae6c403af273add49a149d7f 100644
--- a/test/src/test/resources/hudson/slaves/NodePropertyTest/PropertyImpl/config.jelly
+++ b/test/src/test/resources/hudson/slaves/NodePropertyTest/PropertyImpl/config.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
   <f:entry field="name" title="${%Name}">
     <f:textbox default="Duke"/>
diff --git a/test/src/test/resources/hudson/util/FormFieldValidatorTest/BrokenFormValidatorBuilder/config.jelly b/test/src/test/resources/hudson/util/FormFieldValidatorTest/BrokenFormValidatorBuilder/config.jelly
index 8adf661b404b194a4c7ff9c2b80d617e34dc797f..30e9a060c436401efe813da92a1061f8f99573d0 100644
--- a/test/src/test/resources/hudson/util/FormFieldValidatorTest/BrokenFormValidatorBuilder/config.jelly
+++ b/test/src/test/resources/hudson/util/FormFieldValidatorTest/BrokenFormValidatorBuilder/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 	<f:entry title="xyz" field="xyz">
 	  <f:textbox />
diff --git a/test/src/test/resources/lib/form/AdvancedButtonTest/testNestedOptionalBlock.jelly b/test/src/test/resources/lib/form/AdvancedButtonTest/testNestedOptionalBlock.jelly
index 14179ade02ab14d8823ca2cbec25bc728102d700..aafa14f847e4bad9926ccdabe54996e97d29db80 100644
--- a/test/src/test/resources/lib/form/AdvancedButtonTest/testNestedOptionalBlock.jelly
+++ b/test/src/test/resources/lib/form/AdvancedButtonTest/testNestedOptionalBlock.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing the effect of validateButton">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/DropdownListTest/test1.jelly b/test/src/test/resources/lib/form/DropdownListTest/test1.jelly
index fb7732a4ee441661c49fbebf48989dfd816b5cf3..875c5ad5c4e6a594e2041554e680f25f67d403a0 100644
--- a/test/src/test/resources/lib/form/DropdownListTest/test1.jelly
+++ b/test/src/test/resources/lib/form/DropdownListTest/test1.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing the effect of validateButton">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/EnumSetTest/test1.jelly b/test/src/test/resources/lib/form/EnumSetTest/test1.jelly
index 7c73ec29395fe9fb6fe282106a17793a2f76d3c9..ccf57e284a0d1ffc5850709b7b617f9fc89080dd 100644
--- a/test/src/test/resources/lib/form/EnumSetTest/test1.jelly
+++ b/test/src/test/resources/lib/form/EnumSetTest/test1.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing the effect of enumSet">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/NameRefTest/test1.jelly b/test/src/test/resources/lib/form/NameRefTest/test1.jelly
index 9ea73dc50490ab5389d0556b1978b9626aee6614..046e21ac30173e4b4994d3b000f861c9ac19d892 100644
--- a/test/src/test/resources/lib/form/NameRefTest/test1.jelly
+++ b/test/src/test/resources/lib/form/NameRefTest/test1.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Creating all kinds of fun @nameRef tree">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/PasswordTest/test1.jelly b/test/src/test/resources/lib/form/PasswordTest/test1.jelly
index bdd2cc0ca408848b5e5acf54d66214138db2a59c..94fc58a272bef5ca8ff0e9201b194f60844ef3c9 100644
--- a/test/src/test/resources/lib/form/PasswordTest/test1.jelly
+++ b/test/src/test/resources/lib/form/PasswordTest/test1.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Making sure the password field gets an encrypted value">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/RepeatableTest/Apple/config.jelly b/test/src/test/resources/lib/form/RepeatableTest/Apple/config.jelly
index 69c6a6a5215c7582f1ad94285b5fbf6aef9e4e4f..ddd08f15c697285ee08555743af7849554a529e5 100644
--- a/test/src/test/resources/lib/form/RepeatableTest/Apple/config.jelly
+++ b/test/src/test/resources/lib/form/RepeatableTest/Apple/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <f:entry>
   <f:textbox clazz="number" name="seeds" value="${fruit.seeds}"/>
diff --git a/test/src/test/resources/lib/form/RepeatableTest/Banana/config.jelly b/test/src/test/resources/lib/form/RepeatableTest/Banana/config.jelly
index 629d61ef8245635514fcf1c4af0c70e8d0d5d6e3..fe799af5e8e2ba0efa025c33934f5c16f5202052 100644
--- a/test/src/test/resources/lib/form/RepeatableTest/Banana/config.jelly
+++ b/test/src/test/resources/lib/form/RepeatableTest/Banana/config.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <f:entry>
   <f:checkbox name="yellow" checked="${fruit.yellow}"/>
diff --git a/test/src/test/resources/lib/form/RepeatableTest/testDropdownList.jelly b/test/src/test/resources/lib/form/RepeatableTest/testDropdownList.jelly
index db7c1239a7a74aacc4aac9c307a77bfa68b98a09..2f5b564d2cbf78047ac637d42fd01bd2802eb9cb 100644
--- a/test/src/test/resources/lib/form/RepeatableTest/testDropdownList.jelly
+++ b/test/src/test/resources/lib/form/RepeatableTest/testDropdownList.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing dropdownList in repeatable">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/RepeatableTest/testNested.jelly b/test/src/test/resources/lib/form/RepeatableTest/testNested.jelly
index f367871a2db6e0b5d4946b943038a0bbac7eaf48..76674f2d35f9a57ceefedb4eac93248f8b032295 100644
--- a/test/src/test/resources/lib/form/RepeatableTest/testNested.jelly
+++ b/test/src/test/resources/lib/form/RepeatableTest/testNested.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing radio block in repeatable">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/RepeatableTest/testNestedRadio.jelly b/test/src/test/resources/lib/form/RepeatableTest/testNestedRadio.jelly
index 80e8ecc3cc26b796a8a37a0792fc6bbb6eb6677c..0cb9b43ec4c8ac0237c764938560173cc671fec2 100644
--- a/test/src/test/resources/lib/form/RepeatableTest/testNestedRadio.jelly
+++ b/test/src/test/resources/lib/form/RepeatableTest/testNestedRadio.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing radio block in repeatable">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/RepeatableTest/testRadio.jelly b/test/src/test/resources/lib/form/RepeatableTest/testRadio.jelly
index ae4142d09a7ade3febffec7897d52871f9c682ac..747563e9d9a63ef05b7ffad01e26249d71036aa8 100644
--- a/test/src/test/resources/lib/form/RepeatableTest/testRadio.jelly
+++ b/test/src/test/resources/lib/form/RepeatableTest/testRadio.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing radio block in repeatable">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/RepeatableTest/testRadioBlock.jelly b/test/src/test/resources/lib/form/RepeatableTest/testRadioBlock.jelly
index 32689f687cc22c54218b3d6c9329ec5ba2b77eb6..0bc76c6658279d96cacddb2c0277165b479ca2db 100644
--- a/test/src/test/resources/lib/form/RepeatableTest/testRadioBlock.jelly
+++ b/test/src/test/resources/lib/form/RepeatableTest/testRadioBlock.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing radio block in repeatable">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/RepeatableTest/testSimple.jelly b/test/src/test/resources/lib/form/RepeatableTest/testSimple.jelly
index d60849561d3585e18c94db518fcec42310597c32..17c3deb983a1ccfc861ce6ca67bc440e7a2154ca 100644
--- a/test/src/test/resources/lib/form/RepeatableTest/testSimple.jelly
+++ b/test/src/test/resources/lib/form/RepeatableTest/testSimple.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing radio block in repeatable">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/form/ValidateButtonTest/test1.jelly b/test/src/test/resources/lib/form/ValidateButtonTest/test1.jelly
index 95e4accf8403ded9ba49e63f10c7ce55c58e1a82..98a8773dc7f92298a7449639d964ca2161acdec5 100644
--- a/test/src/test/resources/lib/form/ValidateButtonTest/test1.jelly
+++ b/test/src/test/resources/lib/form/ValidateButtonTest/test1.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing the effect of validateButton">
   <l:main-panel>
diff --git a/test/src/test/resources/lib/hudson/ActionsTest/RootActionImpl/action.jelly b/test/src/test/resources/lib/hudson/ActionsTest/RootActionImpl/action.jelly
index dabf5deb050011e7ce6881b471d447c39ec75b50..d816bb25f411c53e03603ac3008cef047522de11 100644
--- a/test/src/test/resources/lib/hudson/ActionsTest/RootActionImpl/action.jelly
+++ b/test/src/test/resources/lib/hudson/ActionsTest/RootActionImpl/action.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
   <div>
     <b id='bravo'>Bravo</b>
diff --git a/test/src/test/resources/lib/layout/RenderOnDemandTest/testBehaviour.jelly b/test/src/test/resources/lib/layout/RenderOnDemandTest/testBehaviour.jelly
index d26f64add080b216b31b683a77740ac06e7bb143..22446e40450311fcfb70868249b4035da5131957 100644
--- a/test/src/test/resources/lib/layout/RenderOnDemandTest/testBehaviour.jelly
+++ b/test/src/test/resources/lib/layout/RenderOnDemandTest/testBehaviour.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="">
   <l:main-panel>
diff --git a/test/src/test/resources/scripts/BehaviorTest/testCssSelectors.jelly b/test/src/test/resources/scripts/BehaviorTest/testCssSelectors.jelly
index 61f6ba8daab0666b10d4e9143da21e6d2e110aaf..0138a0c33acb8815ca794a2dca742ac14c66ff80 100644
--- a/test/src/test/resources/scripts/BehaviorTest/testCssSelectors.jelly
+++ b/test/src/test/resources/scripts/BehaviorTest/testCssSelectors.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout title="Testing the effect of validateButton">
   <l:main-panel>