Fixes #3491 to work in the face of a cancelled drain request

Revert "Revert "Fixes for #3491 allow claim to be kept idle after condor_rm""

This reverts commit 427b1777b61b875d9a9f18df7db8a90a48ee7359.