George's fixes for buildsystem
Adjusted custom caller id processing to be similar with how is done in 4.4 commits:
c0a90a3608d8deceb2cbf1e2fadf54c368023c05
6770366d4236a2626011b3c4f1eb75a3fe96d46e