TRUNK-3909, backport edit_privileges liquibase changes