Merge commit 'mvpel/sys_uptime'

Conflicts:
	libpromises/sysinfo.c
Fix mismerge.

i is used later on, so use a local variable.
Add tests for $(sys.uptime/systime/sysday).