[WFLY-3978] - PicketLink EAP 6.4 issues.
Merge pull request #6821 from pedroigor/master

[WFLY-3978] - PicketLink EAP 6.4 Issues