Merge "Portal Widget microservices configuration change"