Fix dynamic namespace handling.

@bug W-2109463@

@rev dchasman@
Merging origin/goliver/master-pending-fix-dn into master