Update git hashes for Drupal WxT.

Also update some terminology to be more consistent.
Merge pull request #1115 from sylus/7.x-1.x

Update git hashes for Drupal WxT.