Londiste: fix trigger generation when extra params that are add-table specific are used (introduced in commit 364ade9)
Regression test for previous commit
scriptmgr: user= support

Daemon sections can now have user= option.  It makes
scriptmgr launch (and kill) daemons with sudo -u $user.
Merge remote-tracking branch 'petr/master'
scriptmgr: fix ~ expansion
scriptmgr: give -nH args to sudo
merge from upstream