Freagarach noted an issue, and I had a quick fix, but that only looked correct > the committing was done, but not the leave-foundation first.
This fixes that logic.
The cause is that in rP25182 I added a flag to "GetBlockMovementFlag" to return either the current or the template value, and by default it returns the template value.
In doubt I also update gates here.