Ensure JAVA_HOME env var contains architecture
Ensure JAVA_HOME env var contains architecture

During the build of the Elasticsearch image, the Dockerfile sets an
env var specifying the architecture that the image is built for. This
change ensures that this env var is correctly used in the JAVA_HOME
directory.

Closes-Bug: 1780811

Change-Id: I3eeacabafcc3855165519a739792f0570fdfd5d8

stackforge/kolla,stackforge/kolla,openstack/kolla,rahulunair/kolla,rahulunair/kolla,openstack/kolla,stackforge/kolla