Description of problem:
Use upstream drain library to enable skip wait for delete. This should also make it easier to maintain and add new upstream features.
Version-Release number of selected component (if applicable):
Steps to Reproduce:
*** This bug has been marked as a duplicate of bug 1733474 ***