LPS-40154 PORTAL_URL needs groupId to be set so that it shows correct context
LPS-40154 My bad, reverting to your original commit