LUCENE-5714: TestBBoxStrategy work-around for Spatial4j Rect bug #85

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1619165 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6178: backout deprecation until we have a diff default (merge r1619172)

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