Add missing ignore.
Use drupal_is_cli instead of php_sapi_name.
Merge remote-tracking branch 'origin/11-cli' into 11-cli

Conflicts:
	dic.module