Merge pull request #596 from werpu/2.2.x

MYFACES-4605