Merge "Fix contrail verstion from env"