Issue #419: Fixing notices when upgrading from Drupal 7.
Merge pull request #536 from quicksketch/419/update_notices

Issue #419: Fixing notices when upgrading from Drupal 7.