fix bug 1082068 - always prefer packaged ES config
Merge pull request #2428 from rhelmer/bug1082068-force-new-ES-conf

fix bug 1082068 - always prefer packaged ES config