Site-wide wiki macros are no longer copied into each environment. Instead, the `UserMacroProvider` looks up macros in both the environment directory, and the global `wiki-macros` directory. This should fix the annoying and non-intuitive "Environment needs to be upgraded" message that would get raised when the macros were out of sync, and also fix #2140.
