bump master to 3.x/2.x (feign)