From b5843f3b7766c6294c6f7d4a7c6c5b1b67ce8dc1 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Mon, 11 Apr 2011 22:39:01 -0700
Subject: [PATCH] adding the Jelly PI to files that have no expressions in
 PCDATA

---
 core/src/main/resources/hudson/PluginManager/available.jelly | 1 +
 core/src/main/resources/hudson/PluginManager/sidepanel.jelly | 1 +
 core/src/main/resources/hudson/PluginManager/tabBar.jelly    | 1 +
 .../main/resources/hudson/TcpSlaveAgentListener/index.jelly  | 1 +
 .../hudson/diagnosis/MemoryUsageMonitor/index.jelly          | 1 +
 .../resources/hudson/diagnosis/OldDataMonitor/message.jelly  | 1 +
 .../hudson/diagnosis/TooManyJobsButNoView/message.jelly      | 1 +
 .../hudson/lifecycle/WindowsInstallerLink/index.jelly        | 1 +
 .../main/resources/hudson/logging/LogRecorder/delete.jelly   | 1 +
 .../resources/hudson/logging/LogRecorder/sidepanel.jelly     | 1 +
 .../resources/hudson/logging/LogRecorderManager/feeds.jelly  | 1 +
 .../resources/hudson/logging/LogRecorderManager/new.jelly    | 1 +
 .../hudson/logging/LogRecorderManager/sidepanel.jelly        | 1 +
 .../hudson/markup/RawHtmlMarkupFormatter/config.jelly        | 1 +
 .../main/resources/hudson/model/AbstractBuild/changes.jelly  | 1 +
 .../resources/hudson/model/AbstractBuild/sidepanel.jelly     | 1 +
 .../main/resources/hudson/model/AbstractBuild/tasks.jelly    | 1 +
 .../hudson/model/AbstractModelObject/descriptionForm.jelly   | 1 +
 .../hudson/model/AbstractModelObject/editDescription.jelly   | 1 +
 .../BecauseOfUpstreamBuildInProgress/summary.jelly           | 1 +
 .../main/resources/hudson/model/AbstractProject/_api.jelly   | 1 +
 .../resources/hudson/model/AbstractProject/sidepanel.jelly   | 1 +
 .../hudson/model/AbstractProject/wipeOutWorkspace.jelly      | 1 +
 .../model/AbstractProject/wipeOutWorkspaceBlocked.jelly      | 1 +
 .../src/main/resources/hudson/model/Actionable/actions.jelly | 1 +
 core/src/main/resources/hudson/model/AgentSlave/config.jelly | 1 +
 .../main/resources/hudson/model/AllView/newViewDetail.jelly  | 1 +
 .../hudson/model/BooleanParameterDefinition/config.jelly     | 1 +
 .../hudson/model/BooleanParameterDefinition/index.jelly      | 1 +
 .../resources/hudson/model/BooleanParameterValue/value.jelly | 1 +
 .../hudson/model/ChoiceParameterDefinition/config.jelly      | 1 +
 core/src/main/resources/hudson/model/Computer/_api.jelly     | 1 +
 core/src/main/resources/hudson/model/Computer/_script.jelly  | 1 +
 .../main/resources/hudson/model/Computer/ajaxExecutors.jelly | 1 +
 .../src/main/resources/hudson/model/Computer/configure.jelly | 1 +
 .../main/resources/hudson/model/Computer/custom-jnlp.jelly   | 1 +
 core/src/main/resources/hudson/model/Computer/delete.jelly   | 1 +
 .../resources/hudson/model/Computer/load-statistics.jelly    | 1 +
 .../hudson/model/Computer/nodepropertysummaries.jelly        | 1 +
 .../src/main/resources/hudson/model/Computer/sidepanel.jelly | 1 +
 core/src/main/resources/hudson/model/ComputerSet/_new.jelly  | 1 +
 .../main/resources/hudson/model/ComputerSet/configure.jelly  | 1 +
 core/src/main/resources/hudson/model/ComputerSet/new.jelly   | 1 +
 .../main/resources/hudson/model/ComputerSet/sidepanel.jelly  | 1 +
 .../hudson/model/Descriptor/newInstanceDetail.jelly          | 1 +
 .../main/resources/hudson/model/ExternalJob/sidepanel.jelly  | 1 +
 core/src/main/resources/hudson/model/ExternalRun/index.jelly | 1 +
 .../main/resources/hudson/model/ExternalRun/sidepanel.jelly  | 1 +
 .../hudson/model/FileParameterDefinition/config.jelly        | 1 +
 .../hudson/model/FileParameterDefinition/index.jelly         | 1 +
 .../hudson/model/FreeStyleProject/configure-advanced.jelly   | 1 +
 .../hudson/model/FreeStyleProject/newJobDetail.jelly         | 1 +
 core/src/main/resources/hudson/model/Hudson/_restart.jelly   | 1 +
 .../main/resources/hudson/model/Hudson/_safeRestart.jelly    | 1 +
 core/src/main/resources/hudson/model/Hudson/_script.jelly    | 1 +
 .../main/resources/hudson/model/Hudson/accessDenied.jelly    | 1 +
 .../resources/hudson/model/Hudson/configureExecutors.jelly   | 1 +
 core/src/main/resources/hudson/model/Hudson/downgrade.jelly  | 1 +
 core/src/main/resources/hudson/model/Hudson/legend.jelly     | 1 +
 .../main/resources/hudson/model/Hudson/load-statistics.jelly | 1 +
 core/src/main/resources/hudson/model/Hudson/loginError.jelly | 1 +
 core/src/main/resources/hudson/model/Hudson/sidepanel.jelly  | 1 +
 core/src/main/resources/hudson/model/Hudson/systemInfo.jelly | 1 +
 core/src/main/resources/hudson/model/JDK/config.jelly        | 1 +
 core/src/main/resources/hudson/model/Job/_api.jelly          | 1 +
 .../main/resources/hudson/model/Job/configure-entries.jelly  | 1 +
 core/src/main/resources/hudson/model/Job/configure.jelly     | 1 +
 .../resources/hudson/model/Job/jobpropertysummaries.jelly    | 1 +
 core/src/main/resources/hudson/model/Job/main.jelly          | 1 +
 .../main/resources/hudson/model/Job/newInstanceDetail.jelly  | 1 +
 core/src/main/resources/hudson/model/Job/permalinks.jelly    | 1 +
 core/src/main/resources/hudson/model/Job/rssHeader.jelly     | 1 +
 .../main/resources/hudson/model/Label/load-statistics.jelly  | 1 +
 core/src/main/resources/hudson/model/Label/sidepanel.jelly   | 1 +
 .../main/resources/hudson/model/ListView/newViewDetail.jelly | 1 +
 .../main/resources/hudson/model/MyView/newViewDetail.jelly   | 1 +
 core/src/main/resources/hudson/model/MyView/noJob.jelly      | 1 +
 .../main/resources/hudson/model/MyViewsProperty/config.jelly | 1 +
 .../resources/hudson/model/ParameterDefinition/config.jelly  | 1 +
 .../hudson/model/ParametersDefinitionProperty/config.jelly   | 1 +
 .../hudson/model/PasswordParameterDefinition/config.jelly    | 1 +
 .../hudson/model/PasswordParameterDefinition/index.jelly     | 1 +
 .../hudson/model/PasswordParameterValue/value.jelly          | 1 +
 .../resources/hudson/model/Project/configure-entries.jelly   | 1 +
 core/src/main/resources/hudson/model/ProxyView/main.jelly    | 1 +
 .../resources/hudson/model/ProxyView/newViewDetail.jelly     | 1 +
 .../resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly | 1 +
 core/src/main/resources/hudson/model/Run/_api.jelly          | 1 +
 core/src/main/resources/hudson/model/Run/configure.jelly     | 1 +
 core/src/main/resources/hudson/model/Run/consoleFull.jelly   | 1 +
 core/src/main/resources/hudson/model/Run/delete.jelly        | 1 +
 core/src/main/resources/hudson/model/Run/logKeep.jelly       | 1 +
 .../hudson/model/StringParameterDefinition/config.jelly      | 1 +
 .../hudson/model/StringParameterDefinition/index.jelly       | 1 +
 .../resources/hudson/model/StringParameterValue/value.jelly  | 1 +
 core/src/main/resources/hudson/model/TreeView/ajaxRows.jelly | 1 +
 core/src/main/resources/hudson/model/TreeView/main.jelly     | 1 +
 core/src/main/resources/hudson/model/TreeView/newView.jelly  | 1 +
 .../main/resources/hudson/model/TreeView/newViewDetail.jelly | 1 +
 .../main/resources/hudson/model/TreeView/sidepanel2.jelly    | 1 +
 .../model/UpdateCenter/DownloadJob/Installing/status.jelly   | 1 +
 .../model/UpdateCenter/DownloadJob/Pending/status.jelly      | 1 +
 .../model/UpdateCenter/DownloadJob/Success/status.jelly      | 1 +
 core/src/main/resources/hudson/model/UpdateCenter/body.jelly | 1 +
 .../src/main/resources/hudson/model/UpdateCenter/index.jelly | 1 +
 .../main/resources/hudson/model/UpdateCenter/sidepanel.jelly | 1 +
 .../main/resources/hudson/model/View/ajaxBuildQueue.jelly    | 1 +
 .../src/main/resources/hudson/model/View/ajaxExecutors.jelly | 1 +
 core/src/main/resources/hudson/model/View/cc.xml.jelly       | 1 +
 core/src/main/resources/hudson/model/View/configure.jelly    | 1 +
 core/src/main/resources/hudson/model/View/delete.jelly       | 1 +
 core/src/main/resources/hudson/model/View/index.jelly        | 1 +
 core/src/main/resources/hudson/model/View/main.jelly         | 1 +
 core/src/main/resources/hudson/model/View/newJob.jelly       | 1 +
 core/src/main/resources/hudson/model/View/sidepanel.jelly    | 1 +
 .../resources/hudson/model/labels/LabelAtom/configure.jelly  | 1 +
 .../queue/CauseOfBlockage/BecauseNodeIsBusy/summary.jelly    | 1 +
 .../queue/CauseOfBlockage/BecauseNodeIsOffline/summary.jelly | 1 +
 .../node_monitors/AbstractDiskSpaceMonitor/config.jelly      | 1 +
 .../node_monitors/ResponseTimeMonitor/Data/cause.jelly       | 1 +
 .../ZFSInstaller/MigrationCompleteNotice/message.jelly       | 1 +
 .../solaris/ZFSInstaller/MigrationFailedNotice/index.jelly   | 1 +
 .../solaris/ZFSInstaller/MigrationFailedNotice/message.jelly | 1 +
 .../hudson/os/solaris/ZFSInstaller/askRootPassword.jelly     | 1 +
 .../resources/hudson/os/solaris/ZFSInstaller/message.jelly   | 1 +
 .../os/windows/ManagedWindowsServiceConnector/config.jelly   | 1 +
 .../os/windows/ManagedWindowsServiceLauncher/config.jelly    | 1 +
 .../resources/hudson/scm/AbstractScmTagAction/badge.jelly    | 1 +
 .../main/resources/hudson/scm/EmptyChangeLogSet/digest.jelly | 1 +
 .../main/resources/hudson/scm/EmptyChangeLogSet/index.jelly  | 1 +
 core/src/main/resources/hudson/scm/NullSCM/config.jelly      | 1 +
 .../hudson/security/AuthorizationMatrixProperty/config.jelly | 1 +
 .../security/HudsonPrivateSecurityRealm/Details/config.jelly | 1 +
 .../hudson/security/HudsonPrivateSecurityRealm/addUser.jelly | 1 +
 .../hudson/security/HudsonPrivateSecurityRealm/config.jelly  | 1 +
 .../security/HudsonPrivateSecurityRealm/firstUser.jelly      | 1 +
 .../security/HudsonPrivateSecurityRealm/loginLink.jelly      | 1 +
 .../security/HudsonPrivateSecurityRealm/sidepanel.jelly      | 1 +
 .../hudson/security/HudsonPrivateSecurityRealm/signup.jelly  | 1 +
 .../signupWithFederatedIdentity.jelly                        | 1 +
 .../resources/hudson/security/LDAPSecurityRealm/config.jelly | 1 +
 .../resources/hudson/security/PAMSecurityRealm/config.jelly  | 1 +
 .../resources/hudson/security/SecurityRealm/loginLink.jelly  | 1 +
 .../hudson/security/csrf/DefaultCrumbIssuer/config.jelly     | 1 +
 .../resources/hudson/slaves/CommandConnector/config.jelly    | 1 +
 .../resources/hudson/slaves/CommandLauncher/config.jelly     | 1 +
 .../main/resources/hudson/slaves/CommandLauncher/help.jelly  | 1 +
 .../main/resources/hudson/slaves/ComputerLauncher/main.jelly | 1 +
 .../hudson/slaves/ComputerLauncherFilter/main.jelly          | 1 +
 .../hudson/slaves/DelegatingComputerLauncher/config.jelly    | 1 +
 .../hudson/slaves/DumbSlave/configure-entries.jelly          | 1 +
 .../hudson/slaves/DumbSlave/newInstanceDetail.jelly          | 1 +
 .../slaves/EnvironmentVariablesNodeProperty/config.jelly     | 1 +
 .../main/resources/hudson/slaves/JNLPLauncher/config.jelly   | 1 +
 .../hudson/slaves/RetentionStrategy/Demand/config.jelly      | 1 +
 .../hudson/slaves/RetentionStrategy/Scheduled/config.jelly   | 1 +
 .../resources/hudson/slaves/RetentionStrategy/config.jelly   | 1 +
 .../slaves/SimpleScheduledRetentionStrategy/config.jelly     | 1 +
 .../resources/hudson/slaves/SlaveComputer/disconnect.jelly   | 1 +
 .../src/main/resources/hudson/slaves/SlaveComputer/log.jelly | 1 +
 .../resources/hudson/slaves/SlaveComputer/sidepanel2.jelly   | 1 +
 .../resources/hudson/tasks/Ant/AntInstallation/config.jelly  | 1 +
 .../resources/hudson/tasks/ArtifactArchiver/config.jelly     | 1 +
 core/src/main/resources/hudson/tasks/BatchFile/config.jelly  | 1 +
 .../main/resources/hudson/tasks/BuildTrigger/config.jelly    | 1 +
 .../main/resources/hudson/tasks/JavadocArchiver/config.jelly | 1 +
 core/src/main/resources/hudson/tasks/LogRotator/config.jelly | 1 +
 .../resources/hudson/tasks/Mailer/UserProperty/config.jelly  | 1 +
 core/src/main/resources/hudson/tasks/Mailer/config.jelly     | 1 +
 core/src/main/resources/hudson/tasks/Mailer/global.jelly     | 1 +
 .../hudson/tasks/Maven/MavenInstallation/config.jelly        | 1 +
 core/src/main/resources/hudson/tasks/Shell/config.jelly      | 1 +
 core/src/main/resources/hudson/tasks/Shell/global.jelly      | 1 +
 .../resources/hudson/tasks/junit/CaseResult/summary.jelly    | 1 +
 .../hudson/tasks/junit/JUnitResultArchiver/config.jelly      | 1 +
 .../tasks/test/AggregatedTestResultPublisher/config.jelly    | 1 +
 .../resources/hudson/tasks/test/TestObject/sidepanel.jelly   | 1 +
 .../tasks/test/TestResultProjectAction/floatingBox.jelly     | 1 +
 .../hudson/tasks/test/TestResultProjectAction/index.jelly    | 1 +
 .../resources/hudson/tools/CommandInstaller/config.jelly     | 1 +
 .../hudson/tools/InstallSourceProperty/config.jelly          | 1 +
 .../resources/hudson/tools/ToolInstallation/config.jelly     | 1 +
 .../resources/hudson/tools/ToolInstallation/global.jelly     | 1 +
 .../hudson/tools/ZipExtractionInstaller/config.jelly         | 1 +
 core/src/main/resources/hudson/tools/label.jelly             | 1 +
 .../main/resources/hudson/triggers/SCMTrigger/config.jelly   | 1 +
 .../main/resources/hudson/triggers/SCMTrigger/global.jelly   | 1 +
 .../main/resources/hudson/triggers/TimerTrigger/config.jelly | 1 +
 .../main/resources/hudson/util/HudsonIsLoading/index.jelly   | 1 +
 .../resources/hudson/util/HudsonIsRestarting/index.jelly     | 1 +
 .../resources/hudson/views/BuildButtonColumn/column.jelly    | 1 +
 .../hudson/views/BuildButtonColumn/columnHeader.jelly        | 1 +
 .../hudson/views/DefaultMyViewsTabBar/myViewTabs.jelly       | 1 +
 .../resources/hudson/views/DefaultViewsTabBar/viewTabs.jelly | 1 +
 .../main/resources/hudson/views/JobColumn/columnHeader.jelly | 1 +
 .../hudson/views/LastDurationColumn/columnHeader.jelly       | 1 +
 .../hudson/views/LastFailureColumn/columnHeader.jelly        | 1 +
 .../hudson/views/LastStableColumn/columnHeader.jelly         | 1 +
 .../hudson/views/LastSuccessColumn/columnHeader.jelly        | 1 +
 .../main/resources/hudson/views/ListViewColumn/config.jelly  | 1 +
 .../main/resources/hudson/views/StatusColumn/column.jelly    | 1 +
 .../main/resources/hudson/views/WeatherColumn/column.jelly   | 1 +
 .../hudson/widgets/BuildHistoryWidget/entries.jelly          | 1 +
 .../hudson/widgets/HistoryWidget/ajaxBuildHistory.jelly      | 1 +
 .../main/resources/hudson/widgets/HistoryWidget/all.jelly    | 1 +
 .../resources/hudson/widgets/HistoryWidget/entries.jelly     | 1 +
 core/src/main/resources/lib/form/advanced.jelly              | 1 +
 core/src/main/resources/lib/form/block.jelly                 | 1 +
 core/src/main/resources/lib/form/description.jelly           | 1 +
 core/src/main/resources/lib/form/descriptorList.jelly        | 1 +
 core/src/main/resources/lib/form/descriptorRadioList.jelly   | 1 +
 .../main/resources/lib/form/dropdownDescriptorSelector.jelly | 1 +
 core/src/main/resources/lib/form/editableComboBox.jelly      | 1 +
 core/src/main/resources/lib/form/editableComboBoxValue.jelly | 1 +
 core/src/main/resources/lib/form/enum.jelly                  | 1 +
 core/src/main/resources/lib/form/expandableTextbox.jelly     | 1 +
 core/src/main/resources/lib/form/form.jelly                  | 1 +
 core/src/main/resources/lib/form/helpArea.jelly              | 1 +
 core/src/main/resources/lib/form/hetero-radio.jelly          | 1 +
 core/src/main/resources/lib/form/invisibleEntry.jelly        | 1 +
 core/src/main/resources/lib/form/nested.jelly                | 1 +
 core/src/main/resources/lib/form/optionalBlock.jelly         | 1 +
 core/src/main/resources/lib/form/optionalProperty.jelly      | 1 +
 core/src/main/resources/lib/form/password.jelly              | 1 +
 core/src/main/resources/lib/form/prepareDatabinding.jelly    | 1 +
 core/src/main/resources/lib/form/property.jelly              | 1 +
 core/src/main/resources/lib/form/radio.jelly                 | 5 +++--
 core/src/main/resources/lib/form/readOnlyTextbox.jelly       | 1 +
 .../src/main/resources/lib/form/repeatableDeleteButton.jelly | 1 +
 core/src/main/resources/lib/form/repeatableProperty.jelly    | 1 +
 core/src/main/resources/lib/form/richtextarea.jelly          | 1 +
 core/src/main/resources/lib/form/rowSet.jelly                | 1 +
 core/src/main/resources/lib/form/submit.jelly                | 1 +
 core/src/main/resources/lib/form/textarea.jelly              | 1 +
 .../main/resources/lib/form/withCustomDescriptorByName.jelly | 1 +
 core/src/main/resources/lib/hudson/actions.jelly             | 1 +
 core/src/main/resources/lib/hudson/ballColorTd.jelly         | 1 +
 core/src/main/resources/lib/hudson/buildCaption.jelly        | 1 +
 core/src/main/resources/lib/hudson/buildProgressBar.jelly    | 1 +
 core/src/main/resources/lib/hudson/buildRangeLink.jelly      | 1 +
 core/src/main/resources/lib/hudson/editTypeIcon.jelly        | 1 +
 core/src/main/resources/lib/hudson/editableDescription.jelly | 1 +
 core/src/main/resources/lib/hudson/help.jelly                | 1 +
 core/src/main/resources/lib/hudson/listScmBrowsers.jelly     | 1 +
 core/src/main/resources/lib/hudson/progressBar.jelly         | 1 +
 .../hudson/project/config-blockWhenDownstreamBuilding.jelly  | 1 +
 .../hudson/project/config-blockWhenUpstreamBuilding.jelly    | 1 +
 .../resources/lib/hudson/project/config-buildWrappers.jelly  | 1 +
 .../main/resources/lib/hudson/project/config-builders.jelly  | 1 +
 .../lib/hudson/project/config-customWorkspace.jelly          | 1 +
 .../resources/lib/hudson/project/config-disableBuild.jelly   | 1 +
 .../resources/lib/hudson/project/config-publishers.jelly     | 1 +
 .../resources/lib/hudson/project/config-quietPeriod.jelly    | 1 +
 .../resources/lib/hudson/project/config-retryCount.jelly     | 1 +
 core/src/main/resources/lib/hudson/project/config-scm.jelly  | 1 +
 .../main/resources/lib/hudson/project/config-trigger.jelly   | 1 +
 .../lib/hudson/project/config-upstream-pseudo-trigger.jelly  | 1 +
 .../lib/hudson/project/projectActionFloatingBox.jelly        | 1 +
 core/src/main/resources/lib/hudson/projectView.jelly         | 1 +
 core/src/main/resources/lib/hudson/projectViewRow.jelly      | 1 +
 core/src/main/resources/lib/hudson/propertyTable.jelly       | 1 +
 .../src/main/resources/lib/hudson/rssBar-with-iconSize.jelly | 1 +
 core/src/main/resources/lib/hudson/rssBar.jelly              | 1 +
 core/src/main/resources/lib/hudson/setIconSize.jelly         | 1 +
 core/src/main/resources/lib/hudson/summary.jelly             | 1 +
 core/src/main/resources/lib/layout/ajax.jelly                | 1 +
 core/src/main/resources/lib/layout/expandButton.jelly        | 1 +
 core/src/main/resources/lib/layout/hasPermission.jelly       | 1 +
 core/src/main/resources/lib/layout/header.jelly              | 1 +
 core/src/main/resources/lib/layout/isAdmin.jelly             | 1 +
 core/src/main/resources/lib/layout/isAdminOrTest.jelly       | 1 +
 core/src/main/resources/lib/layout/main-panel.jelly          | 1 +
 core/src/main/resources/lib/layout/rightspace.jelly          | 1 +
 core/src/main/resources/lib/layout/side-panel.jelly          | 1 +
 core/src/main/resources/lib/layout/tabBar.jelly              | 1 +
 core/src/main/resources/lib/layout/tasks.jelly               | 1 +
 core/src/main/resources/lib/layout/yui.jelly                 | 1 +
 .../resources/hudson/maven/FilteredChangeLogSet/digest.jelly | 1 +
 .../resources/hudson/maven/FilteredChangeLogSet/index.jelly  | 1 +
 .../src/main/resources/hudson/maven/MavenBuild/actions.jelly | 1 +
 .../hudson/maven/MavenModule/configure-entries.jelly         | 1 +
 .../main/resources/hudson/maven/MavenModuleSet/actions.jelly | 1 +
 .../hudson/maven/MavenModuleSet/ajaxBuildQueue.jelly         | 1 +
 .../maven/MavenModuleSet/deleteAllDisabledModules.jelly      | 1 +
 .../main/resources/hudson/maven/MavenModuleSet/global.jelly  | 1 +
 .../resources/hudson/maven/MavenModuleSet/help-goals.jelly   | 1 +
 .../resources/hudson/maven/MavenModuleSet/newJobDetail.jelly | 1 +
 .../resources/hudson/maven/MavenModuleSet/sidepanel2.jelly   | 1 +
 .../resources/hudson/maven/MavenProbeAction/_script.jelly    | 1 +
 .../resources/hudson/maven/MavenProbeAction/envVars.jelly    | 1 +
 .../main/resources/hudson/maven/MavenProbeAction/index.jelly | 1 +
 .../resources/hudson/maven/MavenProbeAction/sidepanel.jelly  | 1 +
 .../hudson/maven/MavenProbeAction/systemProperties.jelly     | 1 +
 .../hudson/maven/MavenTestDataPublisher/config.jelly         | 1 +
 .../resources/hudson/maven/RedeployPublisher/config.jelly    | 1 +
 .../maven/reporters/MavenAbstractArtifactRecord/badge.jelly  | 1 +
 .../maven/reporters/MavenAbstractArtifactRecord/index.jelly  | 1 +
 .../jvnet/hudson/test/CaptureEnvironmentBuilder/config.jelly | 1 +
 .../hudson/test/ComputerConnectorTester/configure.jelly      | 1 +
 .../org/jvnet/hudson/test/FailureBuilder/config.jelly        | 1 +
 .../resources/org/jvnet/hudson/test/MockBuilder/config.jelly | 1 +
 .../org/jvnet/hudson/test/SleepBuilder/config.jelly          | 1 +
 .../org/jvnet/hudson/test/UnstableBuilder/config.jelly       | 1 +
 test/src/test/resources/hudson/ExceptionTest/ajaxError.jelly | 1 +
 .../markup/MarkupFormatterTest/DummyMarkupImpl/config.jelly  | 1 +
 .../JobPropertyTest/JobPropertyWithConfigImpl/config.jelly   | 1 +
 .../hudson/model/UserPropertyTest/UserProperty1/config.jelly | 1 +
 .../hudson/model/UserPropertyTest/UserProperty2/config.jelly | 1 +
 .../model/ViewPropertyTest/ViewPropertyImpl/config.jelly     | 1 +
 .../LabelAtomPropertyTest/LabelAtomPropertyImpl/config.jelly | 1 +
 .../PageDecoratorImpl/global.jelly                           | 1 +
 .../hudson/slaves/NodePropertyTest/PropertyImpl/config.jelly | 1 +
 .../BrokenFormValidatorBuilder/config.jelly                  | 1 +
 .../form/AdvancedButtonTest/testNestedOptionalBlock.jelly    | 1 +
 .../src/test/resources/lib/form/DropdownListTest/test1.jelly | 1 +
 test/src/test/resources/lib/form/EnumSetTest/test1.jelly     | 1 +
 test/src/test/resources/lib/form/NameRefTest/test1.jelly     | 1 +
 test/src/test/resources/lib/form/PasswordTest/test1.jelly    | 1 +
 .../resources/lib/form/RepeatableTest/Apple/config.jelly     | 1 +
 .../resources/lib/form/RepeatableTest/Banana/config.jelly    | 1 +
 .../resources/lib/form/RepeatableTest/testDropdownList.jelly | 1 +
 .../test/resources/lib/form/RepeatableTest/testNested.jelly  | 1 +
 .../resources/lib/form/RepeatableTest/testNestedRadio.jelly  | 1 +
 .../test/resources/lib/form/RepeatableTest/testRadio.jelly   | 1 +
 .../resources/lib/form/RepeatableTest/testRadioBlock.jelly   | 1 +
 .../test/resources/lib/form/RepeatableTest/testSimple.jelly  | 1 +
 .../test/resources/lib/form/ValidateButtonTest/test1.jelly   | 1 +
 .../lib/hudson/ActionsTest/RootActionImpl/action.jelly       | 1 +
 .../lib/layout/RenderOnDemandTest/testBehaviour.jelly        | 1 +
 .../resources/scripts/BehaviorTest/testCssSelectors.jelly    | 1 +
 330 files changed, 332 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/hudson/PluginManager/available.jelly b/core/src/main/resources/hudson/PluginManager/available.jelly
index dcfc05b5ce..8a029af350 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 aa77d49ecd..b6c634dae2 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 1a7e8eeb3a..c974dfbb26 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 028fa38edf..a47151e632 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 02886eb08f..452240fe08 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 82608a7191..89d38c592e 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 c23ff98a0b..efb2a520d9 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 79c64b5d37..54623045b4 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 0e0f74c945..896f9a30ba 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 57211bdc8a..2ea64f89ab 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 0b1de720a5..8c2d562f17 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 5055877ec1..f67e19f372 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 659a2705a9..f31a6c887d 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 3bc229ac77..724f54a7ad 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 ad4a0098ae..8b357557ff 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 65deaad37e..a8a2ad2e35 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 ee93a499e6..8e2b044b6d 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 41eef86acb..e4a33075e0 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 2175180fa0..02531915fa 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 2fb40a6807..677a7b0902 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 d46b0d447d..51dd0bbb1f 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 245910626a..48f619b2ba 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 7433430f84..4e6e840338 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 0d647d88f8..d7a23429a6 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 13caa2c462..ddfae3c7c9 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 7a4618757d..91ee5b7b35 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 f45272aefa..5493fb58b0 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 b77a47f286..cc4daf5fc2 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 1930ded78e..1d939cb60f 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 a34d37d3c2..4dd9f679d7 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 7d4cba821e..da360341ce 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 2d5207cec7..5a15d7966b 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 790cd0b044..ca26f72079 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 60add04c86..54c676d1aa 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 c027d997b1..f4894e026e 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 e01e999346..df19f8cd2c 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 a4a18a7444..2ae6fea176 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 118774daeb..7a4a00865b 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 efbdcc8ff9..78df2245df 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 6da741a7c6..3e03bf16c9 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 2de2519bfe..7859b32bfc 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 ac60dddb2d..5a88fd686e 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 a90c38af8f..6e489bbae7 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 2c3b9f477a..582833635b 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 da1756c496..4e5890320a 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 aeb62bcba2..d61b7e8ad4 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 b0fc03f4f8..997dcbe280 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 206f770981..6ea7b4bcdc 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 2b4f36c88a..5ce7b2b6d6 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 f828ca79ab..543b298f4d 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 f8b06aadc2..fabc6c1fb5 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 489155118e..583f693ef4 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 ad845a6734..7816f469c5 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 aae8c9fc1a..3a76e6af82 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 525b98b977..b8f756f81b 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 1a67a5d990..e61874b122 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 9420cbf60a..009b333d39 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 fccc931986..fe6515eeea 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 96fb7b367f..16bcdd21d5 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 6888abdc2f..b5f8b441d8 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 9ea9cc33b4..6f7c2bfb22 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 deee8f063a..9ddff73647 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 0445981106..c18e877035 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 8d7c5cadf6..a1ce03075e 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 d5761f70c3..5d019fbb39 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 6b48007369..426e0d7040 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 67d67d77a3..fce9346ccf 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 036fcb3904..98ada71090 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 1a97b97e33..43f95ecf9e 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 4be3c3454e..d21d52fcd0 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 d4ec689167..5517dcb415 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 6f9dc99483..18e20db56f 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 118774daeb..7a4a00865b 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 5574ee6ae6..0e97e26a33 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 fd06b56a12..40ceb9f19d 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 fd06b56a12..40ceb9f19d 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 a7b538dc48..c80ce5afeb 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 ca35c5c4aa..3d078144bb 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 951fee6d57..9a04ea5e5b 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 196a004103..b2a1f6ba10 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 175f87661c..2ccb38245e 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 acaec9ee06..84281a551a 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 a064c798d6..d1a142f2db 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 dd6051707a..e296f2c51d 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 6e040649bf..945955932f 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 4553c537fe..de5a9f0c8b 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 8bc00359c6..4c1d872109 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 dcfffb68a3..bd82140911 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 1fc0292ace..39da7a2644 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 3312a8edfc..6e4a820d9d 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 c2f0fd5bb1..eb0804f27a 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 1f4e55eb2e..a33b78c6d9 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 c6cdc7a991..a3d0a55a6a 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 3fe0f53acd..1fea88f777 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 0bbebe6420..961a583d29 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 28a548ce42..91964029b0 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 070f0befab..0f14902005 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 8df6b64a9f..9f22b566ac 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 b118665dab..b7c7ea1666 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 b15b5f6c77..3b8ac80aed 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 5e3934ee25..fe7c17549f 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 4f6c0ea68b..1a74265b22 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 de52a70223..6629ebbd25 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 6b4773c738..af306b90de 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 7a685af587..dfd7d7a6b6 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 1944316214..9014b87778 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 73731b8c03..c8eccf4f4a 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 3deb4e7da2..715bd3fec2 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 099f48340b..46253ec93d 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 e3bca1ecab..b00f718629 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 03f8a1ae52..4af40c77b9 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 44b210bc1c..65854d86ec 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 c746ab86af..51fd27bbc9 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 1cbdff1558..74a3f6ddef 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 52212cf04f..cfd22a1533 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 8a3dabb887..a6f3cb22e1 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 2f6f6ebe45..43a71e199c 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 2f6f6ebe45..43a71e199c 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 d050916def..642ef96d34 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 31cc91039f..6b16144546 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 4b61f38223..cbdaec1535 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 9696e17117..801b58f596 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 1cdcec0a81..9ea4de3643 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 9ee3c4595a..96bd2b5a3d 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 1c9bc9276b..83612b83d6 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 8516d25bd4..284043dd7b 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 f8f5e684eb..c99e2491a2 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 f43f6d5e4f..b847e86616 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 0294293c94..a568e54518 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 37db1a1645..01eb7e0635 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 ed9122347d..368647627c 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 e10b214672..b3a219bc7a 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 2bd49602f0..f97a4c9e9e 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 f1eef45a07..aed3d5c5c8 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 b3704be5bc..454d733f2e 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 815296d71e..bc44b42acc 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 1ae8de3123..c2ef8305fa 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 204d5afb3a..465c3a6c24 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 bbd78f80bb..3246288fc8 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 dfe99a3935..01c0197a62 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 7818d8bb72..0f8cc20e38 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 374b7cf129..7d51c030c6 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 3c18e5e61c..ac3d0a0f37 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 c216bfc3d1..573cc325c2 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 1da8b8673f..37b017955d 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 1da8b8673f..37b017955d 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 de000a1845..f326f7fa28 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 268d63eab9..658b8a1312 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 bb72b27f37..7db3e308dc 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 1a64eaf3ef..843cb9d3c9 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 2ad0f99bab..4ce1d08718 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 276fcee7d3..8b3ac49a7a 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 74dbd1fae8..9cd7fbc2e6 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 511de81344..b1d938a50d 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 8ee51db517..75d39e3851 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 8b65dbf128..d6c1c24f5f 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 da075705ae..5b00cf6cd7 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 839dca3a8c..707aec5ed0 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 dd85e41359..a000302149 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 3a9b60fa0d..9d2be8d47b 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 e7332d59d4..c3962e3415 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 6bbc6b1710..ee6e04cf2a 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 32d2770cb5..5a6e89a699 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 a5f747511b..35e5f89c41 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 d1a50afe4d..eb3c3db693 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 b664e2ba9e..fce9e41c1b 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 3194d47512..0c3da63629 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 3d25e5f027..d2b1064778 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 7c53e5d57d..a904d86142 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 d13b8f5c88..86a2f50d09 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 e631af5275..e33083850b 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 f7ee189fd9..bea70c99d6 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 1041c6fe4d..cd5a3e2304 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 c92bb263ea..9b002212ee 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 37436e5d3d..dfa7825a3f 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 ec5920d6f1..0102ba7ee4 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 ec59415587..4809dec595 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 60e610486d..3f6f158e11 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 dc9ccf924d..e63803a6fa 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 72f569b9da..3523fbb09f 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 bcb8d1ada1..d9d8012101 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 5bc68fd965..efba856fca 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 de99bab5dd..6862cdf0b4 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 1242f8173d..952041a19f 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 d82417033f..70138d1caa 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 7b4b9ada7e..9b6d78e922 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 3a5d86da2f..43aef5f977 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 984a055e73..d7a86aa966 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 7fbd5fb928..625be9422f 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 7fbf66998e..65e8bb6e45 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 9813dd62c8..9296682ca1 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 927d9a48a4..1d7825c40c 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 03b90be35a..10b55865f6 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 03b90be35a..10b55865f6 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 127854f319..453392129b 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 a316d24564..b00d8b4129 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 8d7490afd7..9bd477572d 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 81e749b382..463770caed 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 42a03d4810..ad96e16780 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 75d61b9f10..db84a4b002 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 0abb54f0c9..b6a7721356 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 92616c87e1..50e49416fc 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 a2e3d1987d..0b5041c1ff 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 885ca24afc..9dc63f6938 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 a945af8d0a..6bb5e1c36d 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 40dffd843f..2a49d5a698 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 f18f772c5a..7d12f405f0 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 224e6ffd59..589a868100 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 60d7c179d2..0750917f33 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 3a3d1b7457..54973dc403 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 a5907ddae6..5193df8043 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 714c97fd48..02e99d33f3 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 2ba8edd425..f82c07ae73 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 639c8070fa..1468ff7138 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 a554ff72a9..6b949f397b 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 6568e09cb1..b33fa377df 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 f59017dd51..567b44e91b 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 142e1eb1ca..dc5f8839ae 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 1a768b9610..99bee7d485 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 053518e1e4..9de583111f 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 3ed5af1659..7e54a44e3e 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 9758add2a9..87ce8bbd37 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 82658a6c4f..7b2827448a 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 b0f71fde18..b9a9c2d232 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 8038d7a462..8344768a0e 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 10c9da5935..522452cc6e 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 d3e96c55f5..73fb755862 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 239745975f..af6af7c7f7 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 e11b05f2b3..a40d2c70b8 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 d10c3d8617..3a36c94cda 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 694063b298..7649ed5e88 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 0f7b21b399..19dd716b87 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 7ce870137e..fd11bc805a 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 edcf4e7c28..f987a27b00 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 7e6d520dce..7326222141 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 417ee493e6..9b585c2260 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 13dadeea1a..85b5ae6cdc 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 ee8e0c0ec3..7ee0ddb014 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 6f1f53247a..c61fa66c0c 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 6e992f97c5..c4ef5fe331 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 f4f0daf640..0b80ca11c3 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 ce33ed5c21..d132e4df4b 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 cfd90012ec..87189b32a0 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 6d6c337b4b..b655da6d59 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 66c129ee51..2aa585cc6c 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 04400e5cd9..2b0c94a313 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 69794835a2..ad1b1f1d1c 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 9a9d964f75..e6d0af9c19 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 ddbe86ae64..1501bae763 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 cd2be7ccff..e60a9d83e7 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 1d65da82ea..ac8347d732 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 72ea416cd7..ddbf60fc64 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 8bfe02bdbe..91084797d7 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 0125f7d33e..76ef13ae74 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 96da937686..49f7b2c9bf 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 285b9490fe..5da3902382 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 557fc95931..1859423743 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 b8ea529381..82091853fc 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 c34f69d485..b075ded2dd 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 fceb533a6b..e9e85179e8 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 b0ca7d8d02..1a55838106 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 1bf647316d..2dad830e0d 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 e08422aef6..6f352feaa0 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 427c1f9fbc..138c220ae0 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 eecf88189c..2b29118941 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 1570dbe2ba..c0c1e8d7bb 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 e0f972c87c..d80e1355bf 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 3c89d6d83e..d42a5f9689 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 53f2667da5..ed9837cf16 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 098185e0b1..cbd5493c99 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 481d9a8dbe..7587229c00 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 84ef9f5238..92e2e12d28 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 7270af4042..31bd6b41f0 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 5037854224..fd203550fe 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 ea1d0ab9b2..b4f4e25284 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 4cc04985a8..9b6e4b469b 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 08519595f3..5b3853ec07 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 8fde3d6b60..66718279d7 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 9e0d2fcf1e..13e473eb30 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 137a878a95..9462d2c8ca 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 75f8a503b3..4850bcf1e7 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 fe98be2e44..51b2e2ba7c 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 73731b8c03..c8eccf4f4a 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 93dc19901d..de6d11a81e 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 445038daf7..8dcf7a5bb4 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 53398c4062..893c69ff8a 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 489155118e..583f693ef4 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 e7d1ecdf51..49417280f0 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 9f20a7b107..0aad7adba3 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 d96643c02c..585b20a52f 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 03cd50b32d..e1c8845d4f 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 deab3dac01..2b38fb7e93 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 3365821161..5de74daf1f 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 d264a1cd76..752656f078 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 a934c4bec5..d3cd0bb9bf 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 44f3b1976f..4be30c9b76 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 1574a4fcc6..05de33efa4 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 31b61f2ada..9d137d24a0 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 60f792c794..e1fca7beae 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 31b61f2ada..9d137d24a0 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 f9672c42ff..da48922bab 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 31b61f2ada..9d137d24a0 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 31b61f2ada..9d137d24a0 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 5d3ee52ac1..e6e48d02e1 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 a2b9737360..00b67dc2c4 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 8dc663c544..541bf9f4a4 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 b5425226ee..8a6ad16898 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 b5425226ee..8a6ad16898 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 777a376b64..8dd990e31f 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 31ed4fa4cb..e883227bd0 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 c04187d5f6..96134fbcd2 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 4bcbab93c4..ca9101f291 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 8adf661b40..30e9a060c4 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 14179ade02..aafa14f847 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 fb7732a4ee..875c5ad5c4 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 7c73ec2939..ccf57e284a 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 9ea73dc504..046e21ac30 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 bdd2cc0ca4..94fc58a272 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 69c6a6a521..ddd08f15c6 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 629d61ef82..fe799af5e8 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 db7c1239a7..2f5b564d2c 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 f367871a2d..76674f2d35 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 80e8ecc3cc..0cb9b43ec4 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 ae4142d09a..747563e9d9 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 32689f687c..0bc76c6658 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 d60849561d..17c3deb983 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 95e4accf84..98a8773dc7 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 dabf5deb05..d816bb25f4 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 d26f64add0..22446e4045 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 61f6ba8daa..0138a0c33a 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>
-- 
GitLab