Upped version to 2.3.38
PRES-6526 Reverted back to old code for resolving default template name