Merge "[PORTAL ] Non-root user DB access from WMS"