Bug 1699 - Fix redefinition of uInt by replacing 2nd def with inclusion of 1st. Also fixed numerous other over qualification of method name and token pasting issues which cause GCCE errors.

[London_Sydney]
Location1=Europe/London
Location2=Australia/Sydney

[Berlin_Delhi]
Location1=Europe/Berlin
Location2=Asia/Delhi

[Tokyo_Tokyo]
Location1=Asia/Tokyo
Location2=Asia/Tokyo