XWIKI-11414: Allow overwrite macro.vm template in wiki based skins
* fix regression