re-add short opts for elasticsearch arguments
Merge branch 'master' into hotfix/no-root-url-binding