POM cleanup and dependency update
Merge branch 'master' into confluence_storage_format