TMDM-7390: "Cannot prepare storage when entity inherited element(s) should be indexed"

Fix collision in index names when siblings in inheritance tree need index on a field named the same (but not inherited).
Updates unit tests to cover scenario.