merged from protocol-3; fix for DFL-273, The DOM tree increases infinitely on editing the DOM tree
merged from protocol-3; fix for DFL-273, The DOM tree increases infinitely on editing the DOM tree

--HG--
branch : protocol-4

runeh/dragonfly-stp-1,runeh/dragonfly-stp-1,runeh/dragonfly-stp-1