Cherry pick fix: don't exit if we can't remove a file that already doesn't exist to release branch

Cherry pick fix: don't exit if we can't remove a file that already doesn't exist to release branch #575