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

Until drain test is fixed.

This reverts commit 51de942bf663dcb9078593aaba9888292127b09b.