Added regression test for HHH-9327

(cherry picked from commit 3da903f064e9c4963efd1f2c21d69af70e4aa1f1)
(cherry picked from commit 1df6c45f8a1a16d16e9a33938787bd2a0c8f1b8c)
HHH-9327 : NamingStrategy regression (reverts HHH-9280)

(cherry picked from commit 30c6e060dba6933702a347e4f82f4579604a2aab)