Fix PHP >= 5.4 for Drupal 7 by using drush/drush:master

Also add a test to prevent this from happening again.