Merge commit 'mvpel/sys_uptime'

Conflicts:
	libpromises/sysinfo.c
Add tests for $(sys.uptime/systime/sysday).