Tidy up ancient checks in macro-user-callerid, add minor D&U fix
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Tidy up ancient checks in macro-user-callerid, add minor D&U fix

Conflicts:
	functions.inc.php