[PATCH 2/3] Use CPHS version of mailbox numbers on SIM if 3GPP version not available.

[Denis Kenzior]

Hi Andrew,

> Otherwise just try to keep the CPHS version of the files in sync.

Patch has been applied.  I've had to do some major refactoring and testing.  
Please test more when you submit.

By the way, I've updated phonesim to support the CPHS versions of the 
elementary files covered here.  Can you review for correctness?

Regards,
-Denis