Use new template for resource update reparse

If the stack-update is switching from pre-HOT to HOT then
the update will fail because the functions are resolved
using the pre-HOT template.

This change uses the new template for the reparse instead of the
old one. It fixes the issue observed but any other effects are
unknown.

Change-Id: I2f749375ccd7ca917387ef96856b1fc248c8567b
Closes-Bug: #1356097
test_parser.py remove some spurious Replay/Verify calls

There are some Replay/Verify calls which don't do anything, so
remove them, for the avoidance of perpetuating them in cut/paste
for new tests.

Change-Id: I4c08732d37ca9c1e15d13217ba257fff1bc2f518
Merge "test_parser.py remove some spurious Replay/Verify calls"
Merge "Use new template for resource update reparse"