Merge branch 'hotfix/restcommands'

* hotfix/restcommands:
  Added status code property
Get rid of the os4j dependency.
Merge branch 'hotfix/tokenfix' into develop

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