Fixes: U4-4474 YSOD when expanding Members tree
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Fixes: U4-4425 Umbraco Macros break on quote, U4-4290 RTE changes Macro parameter values containing right angle brackets, U4-4442 Line break in macro text area breaks the Macro