Do not add Disk endpoints by default, but provide a new option for it; r...

...emoved duplicated SEs

as requested in #5075, the default now is NOT to add the Disk endpoints. It also remove the duplicate SE entries in the same key (cmsName). I tested it in my VM.