Logger.warn is deprecated
Fixes confusing wording in beat doc.  Closes #1223
Merge branch '3.0'

Conflicts:
	celery/worker/consumer.py