Fixes flakes for Issue #2032
Fixes Signature.link* to work when link option is not a list.  Closes #2019

Conflicts:
	celery/canvas.py