LUCENE-2844: fix java 7 <>

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1536178 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-2844: spatial benchmark

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1536181 13f79535-47bb-0310-9956-ffa450edef68