Update confluence to 5.5.3
Merge branch 'new-versions'