Upgrade to Okapi 0.22; remove workaround for https://code.google.com/p/okapi/issues/detail?id=342
Merge pull request #62 from zanata/okapi-0.22

Upgrade to Okapi 0.22; remove workaround for https://code.google.com/p/o...