Merge pull request #221 from volosied/myfaces4404-master

Apply MYFACES-4404 to Master