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