merged from protocol 4 branch; fix for DFL-771; says 'click reload button' when stopped at user.js, very misleadingdefault
merged from protocol 4 branch; fix for DFL-771; says 'click reload button' when stopped at user.js, very misleadingdefault

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