MODE-1696 Removed support for deprecated JSR-170 CND attributes: MULTIPLE and PRIMARY.

 Corrected existing CNDs.