Prepare updates of drupal core and modules
Update Drupal core and some modules
Fix maps