Porting changes from picketlink2/federation.
Merge remote-tracking branch 'upstream/master'
[maven-release-plugin] prepare release v2.5.0.Final
[maven-release-plugin] prepare for next development iteration
Merge branch 'release/2.5.0.Final'
Next release version 2.5.1-SNAPSHOT.
[maven-release-plugin] prepare release v2.5.1.Final
[maven-release-plugin] prepare for next development iteration
Merge branch 'release/2.5.1.Final'
Next release version 2.5.2-SNAPSHOT.
Merge branch 'develop'
[maven-release-plugin] prepare release v2.5.2.Final
[maven-release-plugin] prepare for next development iteration
Merge branch 'release/2.5.2.Final'
Next version is 2.5.3-SNAPSHOT.