Merge "Fixes to appengine templates and update to v1.9.8" into idea133