Merge remote-tracking branch 'upstream/123317-qa3-fixes'
fixes/feedback for https://github.com/dimagi/Vellum/pull/225
change onSaveAndLoad to keep existing instance
correct fix for b805067

and separate out immutable error, and explicitly throw an exception
Merge remote-tracking branch 'mwhite/master' into develop