update part5-templates branch to match documentation https://developers.google.com/appengine/docs/p…

Reviewed in https://codereview.appspot.com/9830044/