[BUGFIX beta] {{yield}} works inside a Metamorph'ed component

This was working in the simple case, but was previously not working if
the `{{yield}}` was inside a conditional or other metamorph-generating
helper.
Merge pull request #4653 from tomdale/yield-metamorph-components

[BUGFIX beta] {{yield}} works inside a Metamorph'ed component