XWIKI-10568: Do not use subdirectories for *.vm files in the skin directory.
XWIKI-10568: Do not use subdirectories for *.vm files in the skin directory.

* Fix failing tests.

xwiki/xwiki-enterprise,xwiki/xwiki-enterprise