XWIKI-10387: $xcontext.macro leaks outside of wiki macros

(cherry picked from commit 99f5c0b376ec12622a2cc59a69ed54e54d5997d1)