Merge pull request #71 from wtlucy/MYFACES-4309_2.3.x

MYFACES-4309 2.3.x