HHH-8021 support overriding nested embeddables with secondary tables