HHH-9190 : consolidate contracts

(cherry picked from commit fbe72e7b641fba2c95ce0b8867e080fb7e52613d)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterMetadataRecognizerInitiator.java