Update to 2.1.

Changes: https://www.elastic.co/guide/en/elasticsearch/reference/2.1/release-notes-2.1.0.html

• Fix path to allow service to start at boot
• Misc cleanup from ohauer

PR: 195861, 204821, 204902, 204910