WELD-1697 Allow to configure the container id within weld-servlet

WELD-1518 Update CrossContextForwardTest