Updating to PicketLink 2.5.1.Final. Merging latest changes from master.