Removed portable types in client.local package (they break the server marshaller)

Also replaced all usages of PageRequest class with HistoryToken, which is the same
thing but properly immutable, and with a multimap