Merge "Expose etcd port as a variable"