TRUNK-3909, backport edit_privileges liquibase changes
Merge pull request #627 from cioan/TRUNK-3909

TRUNK-3909, backport edit_privileges liquibase changes