Merge "Update Portal Images for Role Mgt fix" into frankfurt