[Qgis-developer] cherry pick 2 commits into 2.14?

[Richard Duivenvoorde]

Hi Devs,

Two minor wms-provider fixes commited to current master I like to be
cherry picked to 2.14.

Is that ok?
Can somebody do that for me?

first:

https://github.com/qgis/QGIS/pull/3213/commits/5d80299938d31f1624826fb548e5328f87e5eda6

and then:

https://github.com/qgis/QGIS/commit/f7c1506973dbeee62f96ca65cb06201607877ea2

It's both about the wms legendimage not or wrong showing up in layermanager.

I tried this locally here, but was unsure if I needed to be new PR or
not. I'm also not confident enough doing it, or screwing up 2.14 branch...

Regards,

Richard