merged from protocol 4 branch; one more fix for DFL-655, Tab autocompletion behaviour
merged from protocol 4 branch; one more fix for DFL-655, Tab autocompletion behaviour

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