Apply template to new system applications, enabled on demand restricting for system applications

Refs #1704