Revert "Use /etc/init.d/paster for service restarts"

This reverts commit e23f2bd6bcbb571307b1186c3dd0de7bfedcd879.
Merge branch 'master' into staging