UPC-36 Fix SonarSource headers and date format