Get rid of the os4j dependency.
Merge branch 'hotfix/tokenfix'

* hotfix/tokenfix:
  Get rid of the os4j dependency.