Merge EssNamingConvention3.0 with master
Created by: rathsman
... Update of the Naming Service to comply with EssNamingConvention3.0.
New Device name syntax: Sec-Sub:Dis-Dev-Inx
Created by: rathsman
... Update of the Naming Service to comply with EssNamingConvention3.0.
New Device name syntax: Sec-Sub:Dis-Dev-Inx