Added more configuration variables for new etcd verision + tests
Merge branch 'config_file'