Merge pull request #2223 from maryamtahhan/intel_rdt_core_id_fix