Build from 2.5 Release
Merge from upstream/master, fix pom to exclude vault