Bug 1028987 - Don't use Task.jsm to wait for cleanup function promises. r=jmaher