XD-1651 Adding UUID as part of file name

- Due to a filenumbering bug in SHDP we need to use _ as separator
  until that is fixed in next release