C++ DR2387: a variable template declared wtih (or instantiated with) a

const-qualified type is not implicitly given internal linkage. But a
variable template declared 'static' is.

This reinstates part of r359048, reverted in r359076.

llvm-svn: 359260