Rename IsEtcdConflict to IsEtcdTestFailed
Merge pull request #784 from nyaxt/avoid_magicnum

Rename IsEtcdConflict to IsEtcdTestFailed