Bug 18037: Hold notes template cleanup (from 15545)