WIKI-626 Remove dependencies to Cache macro, Content macro and Comment macro
Merge commit '7223442097c011ea4337c36b9fd36113e33b27c5' into HEAD