Merge "Change sysconf(3) to return long"