Merge "Removes deprecated neutron-opendaylight-l3 env file"