Merge branch 'release_candidate' into installed

Conflicts:
	projects/cadcRegistry/src/resources/RegistryClient.properties