[CAMEL-7313] Polishing to match camel-jdbc wrt generated keys