The patch looks fine to me in general. Only thing I noticed is that with the pkg-message the notice about the config files moving seems to have been dropped from the client component. If the patch is updated for this I'll be happy for it to be commented. Thanks! James