Fix tests, fix celeryctl command for celery 3

All is in the title.

Only commits are important
 	mardiros 	Fix unit tests … 	4b44236
	mardiros 	Fix celeryctl 	b76f06d

Other commits are git rebase/merge on my repository...