Updated the paths for changes in makeup data location

Merged Anjith GEORGE requested to merge path_fixes into master

Updated the paths for changes in makeup data location

Merge request reports