Improve aufs cleanup and debugging Upstream-commit: d4ef551d654b6b3b91aed68152789fc2869d83fd Component: engine