Save journal templates as Journals BUG: 294145 BUG: 289623 FIXED-IN: 4.8.1 MERGE: 4.8 (cherry picked from commit d4ac1b65)