Fixed #20550 -- Added keepdb argument to destroy_test_db
Merge pull request #2764 from gchp/ticket-20550

Fixed #20550 -- Added keepdb argument to destroy_test_db