Merge pull request #11 from autermann/fix/failing-rest-tests

Fix Failing RESTful SOS tests
Merge remote-tracking branch 'upstream/master' into epl-conversion

* upstream/master: