Give ES local-mode configuration precedence

Fixes #552
Test ES local-mode config precedence

Added test for #552 and associated fix by
e4a976ec2de08357567165a986c93edd36c5600e
Backport CASSANDRA-6190

Fixes #548

Reference: https://issues.apache.org/jira/browse/CASSANDRA-6190