confluence cleanup
Merge pull request #3484 from ronie/confluence-fixes

[Confluence] cleanup