Correct placement of <noinclude> tags

The noinclude tags should appear only if the page is not a subpage
and only around the <templatedata> tags.

Change-Id: I492bb35c8f2c70235f3ceefdddcc4df6548d7469