Drupal updates to file_entity, simple_gmap and search_api, _db and
_solr.