Merged V3.0 to HEAD

12795: ALFCOM-2419: ResourceBundleWrapper is no longer (de)serializable after changes merged from 2.1-A rev 8323
   12826: Fix for ETHREEOH-37 and ETHREEOH-176.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/namespace/NamespacePrefixResolver.java

@@ -37,7 +37,7 @@ import org.alfresco.service.PublicService;
  * @author David Caruana
  */
 @PublicService
-public interface NamespacePrefixResolver extends Serializable
+public interface NamespacePrefixResolver 
 {
     /**
      * Gets the namespace URI registered for the given prefix
@@ -76,5 +76,4 @@ public interface NamespacePrefixResolver extends Serializable
      */
     @Auditable
     Collection<String> getURIs();
-
 }