Merge "Fixes to appengine templates and update to v1.9.8" into idea133
automerge: 84da516

* commit '84da51682addb7f11b236ed02b4a94847bc0d57c':
  Fixes to appengine templates and update to v1.9.8