WIKI-626 Remove Cache macro, Content macro and Comment macro from xwiki upgrade branch