update templates to match current infra-test (adding sense id tag) for P...

...S-1338