Issue #2267057 by helmo: Pre-upgrade add ctools to 6.x-2.x .
Merge remote-tracking branch 'origin/6.x-2.x' into 2.3.x-profile

Conflicts:
	drupal-org.make