Merged a fix from 2.3.1 CR1 for s:decorate tag https://issues.jboss.org/browse/JBSEAM-5044

Merged a fix from seam 2.3.1 CR1  for s:decorate tag that prevents us
from upgrading from Mojarra 2.1.7  due to duplicate component errors.