Fix drupal-site.j2 whitespace control
Fix Drupal 6 configuration