Ensure that `{{unbound if foo}}` works properly.
Merge pull request #9687 from rwjblue/more-unbound-fixes

Ensure that `{{unbound if foo}}` works properly.