Merge "Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)"