Trying to add compound navigation to an overridable template.
Move template to a template file.
Fixed template name to allow theme overrides.
Merge branch '7.x-separate-template' into 7.x

* 7.x-separate-template:
  Fixed template name to allow theme overrides.
  Move template to a template file.
  Trying to add compound navigation to an overridable template.