Urgent fix for REST Webapp

Fix two more cases where contexts may not be completed, leading to server running out of database connections.

One case was on fetching eperson record, so would leak a database connection on every successful API call.

Verified fix with `ab` tool (apache benchmark)

`ab -n 10000 "http://127.0.0.1:9999/api/v1/organizations/?access_token=xxxxxxx"`