Don't require templates and applications for triggers and graphs as they will map themselves
Merge branch 'cleanup_lwrps' into integration