Merge branch 'drush_fix' into 1.1.x
Including php class to avoid issue with undefined php prefix
Only write solr.xml for 3.x version of solr
Merge branch 'apache_php_fix'