Fixes: U4-4654 7.1.1 InsertMacroController unescapes objects to string
Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2