fix construction of EtcdErrors
fix up locking to use EtcdLock and actually work