* Updating analytics jenkins role to work again, and to be more consistent with current codebase patterns

* Updating analytics jenkins role to work again, and to be more consistent with current codebase patterns. Moved jenkins.j2 to the directory with other j2 templates