AS7-6588 Add java:comp/InAppClientContainer and java:comp/InstanceName