[178851] content assist for attribute value not working anymore
  plus fix for converterID and validatorID content assist/validation
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java
index d36fe8b..8be278f 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java
@@ -124,7 +124,7 @@
 				result = rawValue;
 			}
 		}
-		return result;
+		return result == null ? null : result.trim();
 	}
 
 	//will return null if there is an IOException with ResourceBundle
diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core.xml
index 315b4a5..0a7ae08 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core.xml
+++ b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core.xml
@@ -158,11 +158,11 @@
 		<entity id="converterId">
 			<trait id="attribute-value-runtime-type">
 				<value>
-					org.eclipse.jst.jsf.core.attributevalues.FacesConfigIdentifierType
+					org.eclipse.jst.jsf.core.attributevalues.FacesConfigConverterIDType
 				</value>
 			</trait>
 			<trait id="config-type">
-				<value>javax.faces.converter.Converter</value>
+				<value>javax.faces.convert.Converter</value>
 			</trait>
 		</entity>
 	</entity>
@@ -288,7 +288,7 @@
 		<entity id="validatorId">
 			<trait id="attribute-value-runtime-type">
 				<value>
-					org.eclipse.jst.jsf.core.attributevalues.FacesConfigIdentifierType
+					org.eclipse.jst.jsf.core.attributevalues.FacesConfigValidatorIDType
 				</value>
 			</trait>
 			<trait id="config-type">