#PL-2782 Change logic for work with .odt templates
Merge remote-tracking branch 'yarg.github/master' into github