C++ template syntax...

Change-Id: I05a350e81f1ddbeae2f66bdd0fdc3587bc568d56
Merge branch 'batch-jobs'

Change-Id: Ifec347cbdff5d9a7bcc130dcae145c784a678479