BS-10626: clean code and add trace when executed. Might help if test
PageTemplateEditionIt failed again.