Merge pull request #853 from dmitrybezer/master

drush wrapper script fixed to respect the $DRUSH_PHP variable
Ensure path returned by drush_server_home() does not have trailing slashes.
Restore comment.
Merge pull request #858 from alexbarrett/master

Ensure path returned by drush_server_home() does not have trailing slashes