Issue #2232391 by alexpott: Revert drupal 8 changes made to generate-d7-content.sh and  generate-d6-content.sh.