Fix metrics for DbBackedQ (rename and add new one)
Fix an issue with retry logic to make sure entry is back in inflightQ when required.