Make config file depend on elasticsearch package.

Also very minor clean up for some config files.

Change-Id: I55ddd7aee2d23efd214d10a198a79a90231deb5c
Merge "Make config file depend on elasticsearch package." into production