Fix VCAP_APPLICATION in the same manner as VCAP_SERVICES