Merge "Typofixes in two apihelp messages for search and templates"