3.6.x uptime fix solaris

Cherry picked fix for solaris uptime calculation.