Allow 'make distclean' to clean up the 'generated' phar.inc
Merge branch 'phardistclean' into PHP-5.5

* phardistclean:
  Allow 'make distclean' to clean up the 'generated' phar.inc
Use PHP's major version when cleaning up Apache .module files
Merge branch 'PHP-5.5'

* PHP-5.5:
  Use PHP's major version when cleaning up Apache .module files
  Allow 'make distclean' to clean up the 'generated' phar.inc