Merge "Return a 404 on quota delete if entry not found"