Merge "Add support of OPENSTACK_HEAT_STACK param"