combine layer type and edit icon when editing (fixes #11411)
use layer title instead of name in server getlegendgraphic response (fixes #11406)