CDE-135 - Reverted change with path composition. Added check for relativize file path method