Fixed merge conflict
Fixed merge conflict
Merged cherry
Added test-data for ecl_get_num_cpu