Make Deferred API compatible with Py2 code and devappserver#42

asriniva merged 1 commit intomainGoogleCloudPlatform/appengine-python-standard:mainfrom

fixdeferredGoogleCloudPlatform/appengine-python-standard:fixdeferredCopy head branch name to clipboard