OPENUCB-215: Updating Drupal 7.24 via merge from panopoly-drops-7 master