Merge "Fix inconsistency in OPENSTACK_PASSWORD value"