am 42afadd4: am 42e563a3: Merge "Remove obsolete WAR."

* commit '42afadd492dd7e75b7ae49e0b68988a52c630acc':
  Remove obsolete WAR.