Upstream 1.8.3
Fix GAE subdomain handling

Conflicts:
	google/appengine/tools/devappserver2/dispatcher.py

Conflicts:
	google/appengine/api/taskqueue/taskqueue_stub.py
	google/appengine/tools/devappserver2/dispatcher.py