Merge from upstream/master, fix pom to exclude vault