Stop & Kill options for containers removal

Closes #6533