Issue #1879022 by omegamonk: Fixed Enforced dependencies errors updating to recent versions of Drupal 7.