Rebase and propagation.
Merge pull request #298 from virtual-world-framework/dont-clear-blockly

Don't clear blockly between scenarios (except major breaks).