Make elasticsearch.yml match packaged version.

We've made some changes to elasticsearch.yml with puppet.  There have been
some changes to the packaged version, entirely in comments, that we should
incorporate into the version that we install.  If we don't, the comments
will be confusing.

Change-Id: Ib9b092cc38203251113354634888df8563010c2c