incrementing mvn version
Merge branch 'release/2.5.8rc'
Merge branch 'master' into dev/SE-216