am 36c1e341: Merge "Remove tests for es__TRADITIONAL."

* commit '36c1e34133f9815e11e2b9a952bbee66c11bd10a':
  Remove tests for es__TRADITIONAL.