Tweak the moved cleanup_dirs to match the original.
Tweak the moved cleanup_dirs to match the original.

Change-Id: I5cb240aa82a5d9ccea539927d355a1f07e728381

citrix-openstack-build/diskimage-builder,openstack/diskimage-builder,NaohiroTamura/diskimage-builder,openstack/diskimage-builder,varunarya10/diskimage-builder,zioproto/diskimage-builder,CSC-IT-Center-for-Science/diskimage-builder,switch-ch/diskimage-builder,JioCloud/diskimage-builder,rdo-management/diskimage-builder,JioCloud/diskimage-builder,eantyshev/diskimage-builder,CSC-IT-Center-for-Science/diskimage-builder,zioproto/diskimage-builder,varunarya10/diskimage-builder,switch-ch/diskimage-builder,takahashinobuyuki/diskimage-builder,takahashinobuyuki/diskimage-builder,eantyshev/diskimage-builder,rdo-management/diskimage-builder,citrix-openstack-build/diskimage-builder,NaohiroTamura/diskimage-builder