merged from protocol 4 branch; fix for DFL-455, Breadcrumb trail disappears on switching the client from attach mode to detach mode or vice versa
merged from protocol 4 branch; fix for DFL-455, Breadcrumb trail disappears on switching the client from attach mode to detach mode or vice versa

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