Upgrade to Drupal 7.31 upstream

Change-Id: I9d169f82a3a61f06da43bb4316d9ddd313e7244c
gitreview points to the contrib branch

Change-Id: If299087358b39971c781dcdb80da67e3af41c131
Merge contrib

Change-Id: I49aa55d5d83f6a71c0f7916e60a77775b5c51c3c
Merge "Merge contrib"