LP1825851 Print template admin misc. repairs/improvements