Upgrade to Drupal 7.31 upstream

Change-Id: I9d169f82a3a61f06da43bb4316d9ddd313e7244c