Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Prevent persistent task listing interruptions on IOExceptions Change-Id: Ib8bd758a3dd9c24968ec58be921c4475a7bde030