Merge "toolbox: implement rm -f flag"