fixed php SCRIPT_NAME usage when --php-app is in place
Merge remote-tracking branch 'origin/uwsgi-2.0-cache-lazy-expire' into uwsgi-2.0
emperor_tyrant_initgroups: ensure ABI compatibility.
Merge remote-tracking branch 'upstream/master'