Followup to #1908812: Remove build-commons-dev.make
Merge branch '7.x-3.x' of git.drupal.org:project/commons into 7.x-3.x