Merge "Do not generate the extra output files index-intro.html and index-news.html."