Stop & Kill options for containers removal

Close #6863