Merge branch 'localNameService' into 'ibm-trunk'

Improved validation of NameComponent id and kind values

See merge request !13