This changes the model during the render function which triggers a new render.
patches issue of 1st parse generating invalid skip logic criteria, before the 2nd parse is triggered by "@invoke('parse')".
Merge branch 'TP259' of github.com:kobotoolbox/dkobo into TP259
Switching to AND|OR rather than ampersand+pipe