Merge "mw.Upload.BookletLayout: Use 'amenableparser' to handle templates in error...