Added granular control of NYSS default template creation.  Fixes #7783.
Merge branch 'dev' into test