aligned on pageContext.request.serverName

Change-Id: I1fedcb4f33fdb71f520406de90ad4fe15f7e0f5c