Fix bug where template argument deduction of a non-type template parameter used

as a template argument in a template-id, from a null non-type template
argument, failed.

Extracted from a patch by James Touton!

llvm-svn: 282641