In the first movie, Maleficent cursed Aurora, not the spinning wheel spindle, and the curse ended with True Love's Kiss. Therefore, it's impossible for the spindle to be cursed in this movie.
At 8:44, a stunt double is clearly seen in the water after Aurora falls off the log.
Diaval appears uncomfortable with being served poultry, presumably due to him actually being a raven. However, ravens do sometimes eat other birds, so he shouldn't have an issue with it.