[Changed] to use old man encounter.
[Fixed] a few bugs in the encounter logic.
Full re-test of old man encounter needed.

Change-Id: I58b149db41fbbd0cfdc8c0b3fbb31532624de12d
[Removed] old old man files.

Change-Id: I76d53c3b8a2bd568e9807a0072d76cbfbef7454a