Fix bug 1039638 - Move template overrides into external files