Merged with OAE Hilary:master

Merged with https://github.com/oaeproject/Hilary/tree/master + fixed merge conflicts. Created separate Rest API util files that are used for the unit-tests, since Avocet modules are non OAE-modules and don't use `oae-rest`.