JBIDE-15849 - JSF Portlet deployment error on JPP 6
Merge branch 'jbide-15849a' of https://github.com/snjeza/jbosstools-portlet into snjeza-jbide-15849b