merged from protocol 4 branch; fix for DFL-624, Element styles can't be edited
merged from protocol 4 branch; fix for DFL-624, Element styles can't be edited

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