Merge "Adding etcd username on linux:system level"