Merge pull request #105 from pedroigor/master

[PLINK-620] - Improvements to Picketlink encryption support.
Merge pull request #106 from pedroigor/master

[PLINK-620] - WildFly changes.