Merge pull request #2084 from ronie/confluence-cleanup