am 42e563a3: Merge "Remove obsolete WAR."

* commit '42e563a3bc08f1785f379166b6519009c8066fdc':
  Remove obsolete WAR.