Fix: restore handling of labels on multi line plots in matplot#521

giulioungaretti merged 2 commits intomicrosoft:mastermicrosoft/Qcodes:masterfrom

jenshnielsen:multilineplotlabelsjenshnielsen/Qcodes:multilineplotlabelsCopy head branch name to clipboard