MB-20845 - better cleanup if file removal has error
MB-20845 - better cleanup if file removal has error

Change-Id: Iff963b4daf26708723bfb9fe4373e072d7317e4d
Reviewed-on: http://review.couchbase.org/67649
Reviewed-by: Marty Schoch <ba9951d7d66412e2a57aea395f01176a793cf5eb@gmail.com>
Tested-by: Steve Yen <ef850f73f7832052d3c6d9b5ddd3a1716d9a57f1@gmail.com>

couchbaselabs/moss,steveyen/moss,steveyen/moss