NH-3615 - Fix mapping by code of classes without namespaces.
Merge remote-tracking branch 'remotes/upstream/3.4.x'