gandaf-server: fixing package on upstart
Merge branch 'master' of github.com:tsuru/tsuru-deb

Conflicts:
	gandalf-server-deb/debian/changelog