[#1115] Changes name of parent header block
[#1115] Change block names within child template and not parent as it could cause block extension issues
Merge branch '1115-header-block-recursion'