XWIKI-9349: Introduce output instance component for WikiStream
* reduce code duplication
XWIKI-9521: Links to attachments in wiki pages should be relative
Merge branch 'master' into feature-resource-and-wiki-modules
XWIKI-9236: Introduce new Wiki Module to manage wiki descriptors
XWIKI-9237: Introduce new Resource module to represent a Resource being addressed
* Fixed merge error