diff --git a/.externalToolBuilders/JibX.launch b/.externalToolBuilders/JibX.launch
index 12cc9fa8d6..6f2faabe00 100644
--- a/.externalToolBuilders/JibX.launch
+++ b/.externalToolBuilders/JibX.launch
@@ -1,36 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_10"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Repository}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;workingSet&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Repository&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Repository"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk1.5.0_10"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_02&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.antHome&quot;&gt;&#13;&#10;&lt;memento default=&quot;true&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.extraClasspathEntries&quot;&gt;&#13;&#10;&lt;memento/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/jibx/jibx-run.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/jibx/jibx-bind.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/bcel.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/xpp3-1.1.3_8.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/Repository/build.xml"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Repository/build.xml}"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/Repository/build.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_02&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.antHome&quot;&gt;&#13;&#10;&lt;memento default=&quot;true&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.extraClasspathEntries&quot;&gt;&#13;&#10;&lt;memento/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/jibx/jibx-run.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/jibx/jibx-bind.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/bcel.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/xpp3-1.1.3_8.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Repository"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Repository}"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;workingSet&quot; name=&quot;workingSet&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Repository&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Repository/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml
index 93b3f13c58..9ad2747070 100644
--- a/config/alfresco/application-context.xml
+++ b/config/alfresco/application-context.xml
@@ -29,7 +29,7 @@
     <import resource="classpath:alfresco/avm-services-context.xml" />
     <import resource="classpath:alfresco/audit-services-context.xml" />
     <import resource="classpath:alfresco/attributes-service-context.xml"/>
-    <import resource="classpath:alfresco/linkvalidation-service-context.xml"/>
+<!--    <import resource="classpath:alfresco/linkvalidation-service-context.xml"/>  -->
     <import resource="classpath:alfresco/remote-services-context.xml"/>
     <import resource="classpath*:alfresco/patch/*-context.xml" />
     <import resource="classpath*:alfresco/domain/*-context.xml" />
diff --git a/config/alfresco/bootstrap/webScripts.xml b/config/alfresco/bootstrap/webScripts.xml
index 4d634048f0..74b6010897 100644
--- a/config/alfresco/bootstrap/webScripts.xml
+++ b/config/alfresco/bootstrap/webScripts.xml
@@ -64,7 +64,7 @@
                       </view:properties>
                       <view:associations>
                         <cm:contains>
-                          <cm:content view:childName="cm:categorysearch_get.js">
+                          <cm:content view:childName="cm:categorysearch.get.js">
                             <view:aspects>
                               <cm:titled></cm:titled>
                               <app:inlineeditable></app:inlineeditable>
@@ -73,14 +73,14 @@
                             <view:properties>
                               <app:editInline>true</app:editInline>
                               <cm:description></cm:description>
-                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/categorysearch_get.js|mimetype=application/x-javascript|size=121|encoding=UTF-8|locale=en_US_</cm:content>
-                              <cm:title>categorysearch_get.js</cm:title>
+                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/categorysearch.get.js|mimetype=application/x-javascript|size=121|encoding=UTF-8|locale=en_US_</cm:content>
+                              <cm:title>categorysearch.get.js</cm:title>
                               <cm:author></cm:author>
-                              <cm:name>categorysearch_get.js</cm:name>
+                              <cm:name>categorysearch.get.js</cm:name>
                             </view:properties>
                             <view:associations></view:associations>
                           </cm:content>
-                          <cm:content view:childName="cm:categorysearch_get_atom.ftl">
+                          <cm:content view:childName="cm:categorysearch.get.atom.ftl">
                             <view:aspects>
                               <cm:titled></cm:titled>
                               <cm:author></cm:author>
@@ -89,15 +89,15 @@
                             <view:properties>
                               <app:editInline>true</app:editInline>
                               <cm:description></cm:description>
-                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/categorysearch_get_atom.ftl|mimetype=text/plain|size=778|encoding=UTF-8|locale=en_US_</cm:content>
-                              <cm:title>categorysearch_get_atom.ftl</cm:title>
+                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/categorysearch.get.atom.ftl|mimetype=text/plain|size=778|encoding=UTF-8|locale=en_US_</cm:content>
+                              <cm:title>categorysearch.get.atom.ftl</cm:title>
                               <cm:author></cm:author>
                               <sys:store-protocol>workspace</sys:store-protocol>
-                              <cm:name>categorysearch_get_atom.ftl</cm:name>
+                              <cm:name>categorysearch.get.atom.ftl</cm:name>
                             </view:properties>
                             <view:associations></view:associations>
                           </cm:content>
-                          <cm:content view:childName="cm:categorysearch_get_desc.xml">
+                          <cm:content view:childName="cm:categorysearch.get.desc.xml">
                             <view:aspects>
                               <cm:titled></cm:titled>
                               <cm:author></cm:author>
@@ -106,14 +106,14 @@
                             <view:properties>
                               <app:editInline>true</app:editInline>
                               <cm:description></cm:description>
-                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/categorysearch_get_desc.xml|mimetype=text/xml|size=375|encoding=UTF-8|locale=en_US_</cm:content>
-                              <cm:title>categorysearch_get_desc.xml</cm:title>
+                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/categorysearch.get.desc.xml|mimetype=text/xml|size=375|encoding=UTF-8|locale=en_US_</cm:content>
+                              <cm:title>categorysearch.get.desc.xml</cm:title>
                               <cm:author></cm:author>
-                              <cm:name>categorysearch_get_desc.xml</cm:name>
+                              <cm:name>categorysearch.get.desc.xml</cm:name>
                             </view:properties>
                             <view:associations></view:associations>
                           </cm:content>
-                          <cm:content view:childName="cm:categorysearch_get_html.ftl">
+                          <cm:content view:childName="cm:categorysearch.get.html.ftl">
                             <view:aspects>
                               <cm:titled></cm:titled>
                               <cm:author></cm:author>
@@ -122,10 +122,10 @@
                             <view:properties>
                               <app:editInline>true</app:editInline>
                               <cm:description></cm:description>
-                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/categorysearch_get_html.ftl|mimetype=text/plain|size=364|encoding=UTF-8|locale=en_US_</cm:content>
-                              <cm:title>categorysearch_get_html.ftl</cm:title>
+                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/categorysearch.get.html.ftl|mimetype=text/plain|size=364|encoding=UTF-8|locale=en_US_</cm:content>
+                              <cm:title>categorysearch.get.html.ftl</cm:title>
                               <cm:author></cm:author>
-                              <cm:name>categorysearch_get_html.ftl</cm:name>
+                              <cm:name>categorysearch.get.html.ftl</cm:name>
                             </view:properties>
                             <view:associations></view:associations>
                           </cm:content>
diff --git a/config/alfresco/bootstrap/webscripts/categorysearch_get_atom.ftl b/config/alfresco/bootstrap/webscripts/categorysearch.get.atom.ftl
similarity index 100%
rename from config/alfresco/bootstrap/webscripts/categorysearch_get_atom.ftl
rename to config/alfresco/bootstrap/webscripts/categorysearch.get.atom.ftl
diff --git a/config/alfresco/bootstrap/webscripts/categorysearch_get_desc.xml b/config/alfresco/bootstrap/webscripts/categorysearch.get.desc.xml
similarity index 100%
rename from config/alfresco/bootstrap/webscripts/categorysearch_get_desc.xml
rename to config/alfresco/bootstrap/webscripts/categorysearch.get.desc.xml
diff --git a/config/alfresco/bootstrap/webscripts/categorysearch_get_html.ftl b/config/alfresco/bootstrap/webscripts/categorysearch.get.html.ftl
similarity index 100%
rename from config/alfresco/bootstrap/webscripts/categorysearch_get_html.ftl
rename to config/alfresco/bootstrap/webscripts/categorysearch.get.html.ftl
diff --git a/config/alfresco/bootstrap/webscripts/categorysearch_get.js b/config/alfresco/bootstrap/webscripts/categorysearch.get.js
similarity index 100%
rename from config/alfresco/bootstrap/webscripts/categorysearch_get.js
rename to config/alfresco/bootstrap/webscripts/categorysearch.get.js
diff --git a/config/alfresco/public-services-context.xml b/config/alfresco/public-services-context.xml
index 3409eb45ab..43ee67b186 100644
--- a/config/alfresco/public-services-context.xml
+++ b/config/alfresco/public-services-context.xml
@@ -1275,23 +1275,18 @@
 
     <!-- LinkValidationService -->
     <!-- Read transaction advisor for link validation service. -->
-    <bean id="linkValidationServiceReadTxnAdvisor" 
+<!--    <bean id="linkValidationServiceReadTxnAdvisor" 
           class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
         <property name="advice">
             <ref bean="retryingReadTxnAdvice"/>
         </property>
         <property name="mappedNames">
             <list>
-                <!-- Takes a value to a collection of webapps -->
-                <!-- (e.g.:   mysite:/www/avm_webapps)        -->
-                <!-- or a specific webapp within a store      -->
-                <!-- (e.g.:   mysite:/www/avm_webapps/ROOT)   -->
                 <value>getBrokenHrefs</value>
             </list>
         </property>
-    </bean>
+    </bean> 
     
-    <!-- Write transaction advisor for link validation service. -->
     <bean id="linkValidationServiceWriteTxnAdvisor" 
           class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
         <property name="advice">
@@ -1299,11 +1294,6 @@
         </property>
         <property name="mappedNames">
             <list>
-                <!-- Takes a value to a collection of webapps -->
-                <!-- (e.g.:   mysite:/www/avm_webapps)        -->
-                <!-- or a specific webapp within a store      -->
-                <!-- (e.g.:   mysite:/www/avm_webapps/ROOT)   -->
-
                 <value>updateHrefInfo</value>
 
             </list>
@@ -1327,6 +1317,6 @@
                 <value>linkValidationServiceReadTxnAdvisor</value>
             </list>
         </property>
-    </bean>
+    </bean>  -->
 
 </beans>