Merge branch 'ISSUE-92'
Merge remote-tracking branch 'upstream/master'
Alias in routingmap

in addition with
- update es to 1.1.0
- make the function to get the server list from discovery which is overridable
Merge pull request #106 from metacret/ISSUE-105

Issue 105