Merge "Update templates to appengine 1.9.11" into idea133