Merge pull request #22 from picturae/17121

Fix skos namespace set. refs #17121
Merge remote-tracking branch 'upstream/master'
Make import to update concepts if notation matches. refs #17315
Merge pull request #34 from picturae/17315

Make import to update concepts if notation matches. refs #17315