Merge "Add short codes for DCB to free UK and 44567 to standard US." into nyc-dev