CFY 1352 openstack router type improvements