Merge pull request #424 from pedroigor/master

[PLINK-620] - Improvements to Picketlink encryption support.