feat(locksmithctl): if etcd is active attempt to unlock

If etcd is active then attempt to unlock any previously held locks. This
will let us cleanup after ourselves if needed.
refactor(locksmitctl): cleanup select for unlockHeldLocks

Based on feedback from Jon clean this up a bit.
refactor(locksmithctl): cleanup waiting logic

More feedback from Jon led to this nice cleanup.