Merge "Add missing DB service entry for local DB deployment" into honolulu