DEVOPS-976 Add support for classpath additions
Fix deprecation warning in template