This is better treated before upgrading to Lucene 5, as it simplified the migration, and allows testing of the Spatial updates independently from all other changes.