Adding 2.6.0 dump/restore support for users and roles