Merge pull request #647 from volosied/4606-22x

Apply updated  MYFACES-4606 fix