Merging SOLR reverse geocoding service provider from remote branch "alessio/12I_CPO_TP_S4_kaso"