Merge "Select $OPENSTACK_TAG instead of stable/ocata"