Remove usage of deprecated urn:clustering:1.0 schema.
Merge pull request #6752 from pferraro/master

Remove usage of deprecated urn:clustering:1.0 schema