Merge .htaccess changes from Drupal core update