fixed: OC: copied fixes from previous merge to OC fs entry point
fixed: OC: copied fixes from previous merge to OC fs entry point

OpenClinica/enketo-express-oc,OpenClinica/enketo-express-oc,OpenClinica/enketo-express-oc