You don't fix trademarks disputes by changing software licenses. Elastic appear to have a sound argument on the trademark front but to conflate that with changing the license of their product is disingenuous.
The damages and ramifications for violating software copyright are much clearer than the nuanced world of trademark infringement.
The change in ElasticSearch license here is well publicised. If AWS were to continue to incorporate new changes to ElasticSearch it would be obvious they had deliberately violated the terms of the license and it's much easier to pursue a legal case.
