Updating solr indexing to add json-encoded fields, remove field_N_subfield fields, fixing spec tests