XWIKI-11163: Cache wiki-based configuration sources
* fix user preferences bug
XWIKI-11193: Any Velocity macro defined in a template located in a skin stay in the VelocityEngine macros cache for good
Merge branch 'master' into feaure-usenewtemplaterenderer
Merge branch 'master' into feaure-usenewtemplaterenderer
XWIKI-11026: During exports, "macros.vm" from "defaultbaseskin" is always used instead of the one from the current skin
Merge branch 'master' into feaure-usenewtemplaterenderer

Conflicts:
	xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-store/src/main/java/org/xwiki/rendering/wikimacro/internal/WikiMacroExecutionEventListener.java
XWIKI-11193: Any Velocity macro defined in a template located in a skin stay in the VelocityEngine macros cache for good
XWIKI-11193: Any Velocity macro defined in a template located in a skin stay in the VelocityEngine macros cache for good
[misc] Remove unused import
Merge branch 'master' into feaure-usenewtemplaterenderer
Merge branch 'master' into feaure-usenewtemplaterenderer