Merge "Fix CIS Benchmark Ubuntu XCCDF file location"