Merge proposals dependent on lp://staging/~canonical-isd-hackers/drupal-launchpad/6.x-code_coverage

1. 6.x-code_coverage
2. Dependent merge proposals