Adding the ability to overload the page template.

This was in 2.1.5 but this ability was lost in 2.2.

Fixes #2589