improved logging on why files sometimes aren't removed
Merge branch '2.3.x' into 2.3.x-demo