Improve the interaction between variable_scope and name_scope. (Also see #1797, #213.)

In particular, this decouples the uniquification of variable scope names
from the surrounding name scope. This is potentially a breaking change for
models that rely on those names, but name_scope was never meant or designed
to flow into variable scope names, so this bug must be corrected at some point.
Change: 124986168